Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14730
Modified Files:
merovingian_discoveryrunner.c
Log Message:
make sure we can see tags in logging too, not just in discover output
U merovingian_discoveryrunner.c
Index: merovingian_discoveryrunner.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_discoveryrunner.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- merovingian_discoveryrunner.c 25 Sep 2009 08:20:39 -0000 1.6
+++ merovingian_discoveryrunner.c 25 Sep 2009 13:54:49 -0000 1.7
@@ -18,7 +18,7 @@
*/
static int
-removeRemoteDB(char *dbname, char *conn)
+removeRemoteDB(const char *dbname, const char *conn)
{
remotedb rdb;
remotedb prv;
@@ -50,7 +50,6 @@
conn, rdb->fullname);
free(rdb->dbname);
free(rdb->conn);
- free(rdb->tag);
free(rdb->fullname);
free(rdb);
hadmatch = 1;
@@ -66,7 +65,7 @@
}
static int
-addRemoteDB(char *dbname, char *conn, int ttl) {
+addRemoteDB(const char *dbname, const char *conn, const int ttl) {
remotedb rdb;
remotedb prv;
char *tag;
@@ -97,10 +96,10 @@
rdb = prv->next = malloc(sizeof(struct _remotedb));
}
rdb->fullname = strdup(dbname);
- if ((tag = strchr(dbname, '/')) != NULL)
- *tag++ = '\0';
rdb->dbname = strdup(dbname);
- rdb->tag = tag != NULL ? strdup(tag) : NULL;
+ if ((tag = strchr(rdb->dbname, '/')) != NULL)
+ *tag++ = '\0';
+ rdb->tag = tag;
rdb->conn = strdup(conn);
rdb->ttl = time(NULL) + ttl;
rdb->next = NULL;
@@ -215,7 +214,6 @@
"has expired\n", rdb->conn,
rdb->fullname);
free(rdb->dbname);
free(rdb->conn);
- free(rdb->tag);
free(rdb->fullname);
free(rdb);
break;
------------------------------------------------------------------------------
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
