Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1676
Modified Files:
monetdb_get.c properties.c
Log Message:
silence compiler: properties.c:139: error: 'lasts''' may be used uninitialized
in this function
U monetdb_get.c
Index: monetdb_get.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb_get.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- monetdb_get.c 17 Sep 2009 20:04:05 -0000 1.4
+++ monetdb_get.c 17 Sep 2009 20:07:05 -0000 1.5
@@ -130,7 +130,19 @@
source = "-";
value = stats->dbname;
} else {
- readProps(props, stats->path);
+ if (mero_running == 1) {
+ char *buf;
+ e = control_send(&buf, mero_control,
-1, stats->dbname, "get");
+ if (e != NULL) {
+ fprintf(stderr, "get: internal
error: %s\n", e);
+ free(e);
+ exit(2);
+ }
+ readPropsBuf(props, buf);
+ free(buf);
+ } else {
+ readProps(props, stats->path);
+ }
kv = findConfKey(props, p);
if (kv == NULL) {
fprintf(stderr, "get: no such property:
%s\n", p);
U properties.c
Index: properties.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/properties.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- properties.c 16 Sep 2009 13:45:40 -0000 1.11
+++ properties.c 17 Sep 2009 20:07:05 -0000 1.12
@@ -136,7 +136,7 @@
confkeyval *t;
char *p;
char *err;
- char *lasts;
+ char *lasts = NULL;
size_t len;
while((p = strtok_r(buf, "\n", &lasts)) != NULL) {
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
