Changeset: c34cb7a301ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c34cb7a301ca
Modified Files:
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
Branch: default
Log Message:
just use a static string, instead of an alloca-ed one
diffs (39 lines):
diff -r c5792c4f88a6 -r c34cb7a301ca
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
--- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Fri Jul
16 10:16:33 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Fri Jul
16 10:47:22 2010 +0200
@@ -272,11 +272,8 @@
}
kv = findConfKey(ckv, "readonly");
- if (kv->val != NULL && strcmp(kv->val, "no") != 0) {
- size_t len = 11;
- readonly = alloca(sizeof(char) * len);
- snprintf(readonly, len, "--readonly");
- }
+ if (kv->val != NULL && strcmp(kv->val, "no") != 0)
+ readonly = "--readonly";
freeConfFile(ckv);
GDKfree(ckv); /* can make ckv static and reuse it all the time
*/
@@ -300,11 +297,6 @@
argv[c++] = _mero_mserver;
argv[c++] = conffile;
argv[c++] = dbname;
-
- if (readonly != NULL) {
- argv[c++] = readonly;
- }
-
argv[c++] = "--set"; argv[c++] = muri;
if (mydoproxy == 1) {
argv[c++] = "--set"; argv[c++] = "mapi_open=false";
@@ -337,6 +329,9 @@
if (slave != NULL) {
argv[c++] = "--set"; argv[c++] = slave;
}
+ if (readonly != NULL) {
+ argv[c++] = readonly;
+ }
/* keep this one last for easy copy/paste with gdb */
argv[c++] = "--set"; argv[c++] = "monet_daemon=yes";
argv[c++] = NULL;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
