Changeset: dec47edf82ab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dec47edf82ab
Modified Files:
sql/server/sql_qc.c
tools/merovingian/daemon/merovingian.h
Branch: Jan2014
Log Message:
Fix "Nesting level does not match indentation" problems.
diffs (37 lines):
diff --git a/sql/server/sql_qc.c b/sql/server/sql_qc.c
--- a/sql/server/sql_qc.c
+++ b/sql/server/sql_qc.c
@@ -255,13 +255,14 @@ qc_insert(qc *cache, sql_allocator *sa,
n->params = NULL;
n->paramlen = paramlen;
- if (paramlen)
+ if (paramlen) {
n->params = SA_NEW_ARRAY(sa, sql_subtype,paramlen);
for (i = 0; i < paramlen; i++) {
atom *a = params[i];
n->params[i] = *(atom_type(a));
}
+ }
n->next = cache->q;
n->stk = 0;
n->code = NULL;
diff --git a/tools/merovingian/daemon/merovingian.h
b/tools/merovingian/daemon/merovingian.h
--- a/tools/merovingian/daemon/merovingian.h
+++ b/tools/merovingian/daemon/merovingian.h
@@ -45,9 +45,11 @@ typedef char* err;
#define NO_ERR (err)0
/* when not writing to stderr, one has to flush, make it easy to do so */
-#define Mfprintf(S, ...) \
- fprintf(S, __VA_ARGS__); \
- fflush(S);
+#define Mfprintf(S, ...) \
+ do {
\
+ fprintf(S, __VA_ARGS__); \
+ fflush(S);
\
+ } while (0)
char *newErr(_In_z_ _Printf_format_string_ const char *fmt, ...)
__attribute__((__format__(__printf__, 1, 2)));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
