Changeset: de58f67faefa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de58f67faefa
Modified Files:
gdk/gdk.h
gdk/gdk_private.h
tools/mserver/mserver5.c
Branch: default
Log Message:
Cleanup: move long_str to gdk_private.h.
diffs (42 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -601,8 +601,6 @@ typedef char *str;
# define LL_CONSTANT(val) (val##i64)
#endif
-typedef char long_str[IDLENGTH]; /* standard GDK static string */
-
typedef oid var_t; /* type used for heap index of var-sized BAT */
#define SIZEOF_VAR_T SIZEOF_OID
#define VARFMT OIDFMT
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -140,6 +140,8 @@ typedef struct {
bat free;
} bbplock_t;
+typedef char long_str[IDLENGTH]; /* standard GDK static string */
+
extern int BBP_dirty; /* BBP table dirty? */
extern batlock_t GDKbatLock[BBP_BATMASK + 1];
extern bbplock_t GDKbbpLock[BBP_THREADMASK + 1];
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -418,12 +418,12 @@ main(int argc, char **av)
usage(prog, -1);
if (debug || grpdebug) {
- long_str buf;
+ char buf[16];
if (debug)
mo_print_options(set, setlen);
debug |= grpdebug; /* add the algorithm tracers */
- snprintf(buf, sizeof(long_str) - 1, "%d", debug);
+ snprintf(buf, sizeof(buf) - 1, "%d", debug);
setlen = mo_add_option(&set, setlen, opt_cmdline, "gdk_debug",
buf);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
