Changeset: 3c71b3b47b38 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c71b3b47b38
Modified Files:
gdk/gdk_logger.c
monetdb5/mal/mal.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_parser.c
monetdb5/modules/mal/bbp.c
Branch: default
Log Message:
Use our own macro PATHLENGTH everywhere instead of MAXPATHLEN.
diffs (257 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1080,7 +1080,7 @@ logger_readlogs(logger *lg, FILE *fp, ch
}
while (fgets(id, sizeof(id), fp) != NULL) {
- char log_filename[MAXPATHLEN];
+ char log_filename[PATHLENGTH];
lng lid = strtoll(id, NULL, 10);
if (lg->debug & 1) {
@@ -1310,8 +1310,8 @@ logger_set_logdir_path(char *filename, c
int role = PERSISTENT; /* default role is persistent, i.e. the default
dbfarm */
if (MT_path_absolute(logdir)) {
- char logdir_parent_path[MAXPATHLEN] = "";
- char logdir_name[MAXPATHLEN] = "";
+ char logdir_parent_path[PATHLENGTH] = "";
+ char logdir_name[PATHLENGTH] = "";
/* split the logdir string into absolute parent dir
* path and (relative) log dir name */
@@ -1319,7 +1319,7 @@ logger_set_logdir_path(char *filename, c
/* set the new relative logdir location
* including the logger function name
* subdir */
- snprintf(filename, MAXPATHLEN, "%s%c%s%c",
+ snprintf(filename, PATHLENGTH, "%s%c%s%c",
logdir_name, DIR_SEP, fn, DIR_SEP);
/* add a new dbfarm for the logger directory
@@ -1336,7 +1336,7 @@ logger_set_logdir_path(char *filename, c
}
} else {
/* just concat the logdir and fn with appropriate separators */
- snprintf(filename, MAXPATHLEN, "%s%c%s%c",
+ snprintf(filename, PATHLENGTH, "%s%c%s%c",
logdir, DIR_SEP, fn, DIR_SEP);
}
@@ -1348,16 +1348,16 @@ logger_set_logdir_path(char *filename, c
* Load data and persist it in the BATs
* Convert 32bit data to 64bit, unless running in read-only mode */
static int
-logger_load(int debug, const char* fn, char filename[MAXPATHLEN], logger* lg)
+logger_load(int debug, const char* fn, char filename[PATHLENGTH], logger* lg)
{
int id = LOG_SID;
FILE *fp;
- char bak[MAXPATHLEN];
+ char bak[PATHLENGTH];
log_bid snapshots_bid = 0;
bat catalog_bid, catalog_nme, dcatalog, bid;
int farmid = BBPselectfarm(lg->dbfarm_role, 0, offheap);
- snprintf(filename, MAXPATHLEN, "%s%s", lg->dir, LOGFILE);
+ snprintf(filename, PATHLENGTH, "%s%s", lg->dir, LOGFILE);
snprintf(bak, sizeof(bak), "%s.bak", filename);
/* try to open logfile backup, or failing that, the file
@@ -1674,7 +1674,7 @@ logger_load(int debug, const char* fn, c
if (fp != NULL) {
#if SIZEOF_OID == 8
- char cvfile[MAXPATHLEN];
+ char cvfile[PATHLENGTH];
#endif
if (check_version(lg, fp) != GDK_SUCCEED) {
@@ -1806,8 +1806,8 @@ static logger *
logger_new(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, int shared, const
char *local_logdir)
{
logger *lg = (struct logger *) GDKmalloc(sizeof(struct logger));
- char filename[MAXPATHLEN];
- char shared_log_filename[MAXPATHLEN];
+ char filename[PATHLENGTH];
+ char shared_log_filename[PATHLENGTH];
if (lg == NULL) {
fprintf(stderr, "!ERROR: logger_new: allocating logger
structure failed\n");
@@ -1910,7 +1910,7 @@ logger_new(int debug, const char *fn, co
int
logger_reload(logger *lg)
{
- char filename[MAXPATHLEN];
+ char filename[PATHLENGTH];
snprintf(filename, sizeof(filename), "%s", lg->dir);
if (lg->debug & 1) {
@@ -2000,7 +2000,7 @@ int
logger_exit(logger *lg)
{
FILE *fp;
- char filename[MAXPATHLEN];
+ char filename[PATHLENGTH];
int farmid = BBPselectfarm(lg->dbfarm_role, 0, offheap);
logger_close(lg);
@@ -2012,7 +2012,7 @@ logger_exit(logger *lg)
snprintf(filename, sizeof(filename), "%s%s", lg->dir, LOGFILE);
if ((fp = GDKfileopen(farmid, NULL, filename, NULL, "w")) != NULL) {
- char ext[MAXPATHLEN];
+ char ext[PATHLENGTH];
if (fprintf(fp, "%06d\n\n", lg->version) < 0) {
(void) fclose(fp);
@@ -2174,7 +2174,7 @@ logger_changes(logger *lg)
lng
logger_read_last_transaction_id(logger *lg, char *dir, char *logger_file, int
role)
{
- char filename[MAXPATHLEN];
+ char filename[PATHLENGTH];
FILE *fp;
char id[BUFSIZ];
lng lid = LOG_ERR;
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -107,10 +107,6 @@ mal_export void mal_exit(void);
#define STRUCT_ALIGNED
#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
/* The MAL instruction block type definitions */
/* Variable properties */
#define VAR_CONSTANT 1
diff --git a/monetdb5/mal/mal_atom.c b/monetdb5/mal/mal_atom.c
--- a/monetdb5/mal/mal_atom.c
+++ b/monetdb5/mal/mal_atom.c
@@ -25,14 +25,10 @@
#include "mal_exception.h"
#include "mal_private.h"
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
static void setAtomName(InstrPtr pci)
{
- char buf[MAXPATHLEN];
- snprintf(buf, MAXPATHLEN, "#%s", getFunctionId(pci));
+ char buf[PATHLENGTH];
+ snprintf(buf, PATHLENGTH, "#%s", getFunctionId(pci));
setFunctionId(pci, putName(buf, strlen(buf)));
}
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -137,14 +137,11 @@ isLoaded(str modulename)
return 0;
}
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
str
loadLibrary(str filename, int flag)
{
int mode = RTLD_NOW | RTLD_GLOBAL;
- char nme[MAXPATHLEN];
+ char nme[PATHLENGTH];
void *handle = NULL;
str s;
int idx;
@@ -186,18 +183,18 @@ loadLibrary(str filename, int flag)
/* try hardcoded SO_EXT if that is the same for modules */
#ifdef _AIX
- snprintf(nme, MAXPATHLEN, "%.*s%c%s_%s%s(%s_%s.0)",
+ snprintf(nme, PATHLENGTH, "%.*s%c%s_%s%s(%s_%s.0)",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s, SO_EXT,
SO_PREFIX, s);
#else
- snprintf(nme, MAXPATHLEN, "%.*s%c%s_%s%s",
+ snprintf(nme, PATHLENGTH, "%.*s%c%s_%s%s",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s, SO_EXT);
#endif
handle = dlopen(nme, mode);
if (handle == NULL && strcmp(SO_EXT, ".so") != 0) {
/* try .so */
- snprintf(nme, MAXPATHLEN, "%.*s%c%s_%s.so",
+ snprintf(nme, PATHLENGTH, "%.*s%c%s_%s.so",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s);
handle = dlopen(nme, mode);
@@ -205,7 +202,7 @@ loadLibrary(str filename, int flag)
#ifdef __APPLE__
if (handle == NULL && strcmp(SO_EXT, ".bundle") != 0) {
/* try .bundle */
- snprintf(nme, MAXPATHLEN, "%.*s%c%s_%s.bundle",
+ snprintf(nme, PATHLENGTH, "%.*s%c%s_%s.bundle",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s);
handle = dlopen(nme, mode);
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1854,7 +1854,7 @@ parseTuple(Client cntxt)
MalBlkPtr curBlk;
Symbol curPrg;
FILE *f = 0;
- char buf[MAXPATHLEN];
+ char buf[PATHLENGTH];
int c;
sprintf(buf, "input%d", (int) (cntxt - mal_clients));
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -165,10 +165,10 @@ CMDbbpLocation(bat *ret)
{
BAT *b;
int i;
- char buf[MAXPATHLEN];
- char cwd[MAXPATHLEN];
+ char buf[PATHLENGTH];
+ char cwd[PATHLENGTH];
- if (getcwd(cwd, MAXPATHLEN) == NULL)
+ if (getcwd(cwd, PATHLENGTH) == NULL)
throw(MAL, "catalog.bbpLocation", RUNTIME_DIR_ERROR);
b = BATnew(TYPE_void, TYPE_str, getBBPsize(), TRANSIENT);
@@ -180,7 +180,7 @@ CMDbbpLocation(bat *ret)
for (i = 1; i < getBBPsize(); i++)
if (i != b->batCacheid) {
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
-
snprintf(buf,MAXPATHLEN,"%s/bat/%s",cwd,BBP_physical(i));
+
snprintf(buf,PATHLENGTH,"%s/bat/%s",cwd,BBP_physical(i));
BUNappend(b, buf, FALSE);
}
}
@@ -393,7 +393,7 @@ str CMDbbp(bat *ID, bat *NS, bat *TT, ba
{
BAT *id, *ns, *tt, *cnt, *refcnt, *lrefcnt, *location, *heat, *dirty,
*status, *kind, *bn;
int i;
- char buf[MAXPATHLEN];
+ char buf[PATHLENGTH];
id = BATnew(TYPE_void, TYPE_int, getBBPsize(), TRANSIENT);
ns = BATnew(TYPE_void, TYPE_str, getBBPsize(), TRANSIENT);
@@ -445,7 +445,7 @@ str CMDbbp(bat *ID, bat *NS, bat *TT, ba
if ((BBP_status(i) & BBPDELETED) ||
!(BBP_status(i) & BBPPERSISTENT))
mode = "transient";
- snprintf(buf, MAXPATHLEN, "%s",
BBP_physical(i));
+ snprintf(buf, PATHLENGTH, "%s",
BBP_physical(i));
BUNappend(id, &i, FALSE);
BUNappend(ns, BBP_logical(i), FALSE);
BUNappend(tt, BATatoms[BATttype(bn)].name,
FALSE);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
