Changeset: 8a5547531893 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8a5547531893
Modified Files:
clients/examples/C/testcondvar.c
sql/backends/monet5/rel_bin.c
sql/server/rel_optimizer.c
tools/merovingian/utils/utils.c
Branch: default
Log Message:
Some layout changes.
diffs (95 lines):
diff --git a/clients/examples/C/testcondvar.c b/clients/examples/C/testcondvar.c
--- a/clients/examples/C/testcondvar.c
+++ b/clients/examples/C/testcondvar.c
@@ -12,8 +12,6 @@
#include "gdk.h"
#include "gdk_system.h"
-#include <assert.h>
-
#define NN (3)
volatile int timeout = 100; // set this to 0 during interactive debugging
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1412,7 +1412,8 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (!left)
return const_column(be, stmt_bool(be,
1));
return left->op4.lval->h->data;
- } if (strcmp(fname, "case") == 0)
+ }
+ if (strcmp(fname, "case") == 0)
return exp2bin_case(be, e, left, right, sel,
depth);
if (strcmp(fname, "casewhen") == 0)
return exp2bin_casewhen(be, e, left, right,
sel, depth);
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -545,7 +545,8 @@ rel_setjoins_2_joingroupby_(visitor *v,
if (is_join(c->op) && !is_processed(c)
&& rel_find_exp(c->r, me->r)) {
p = c;
c = p->r;
- } if (!pp && is_project(c->op) && c->l
&& rel_find_exp(c->l, me->r)) {
+ }
+ if (!pp && is_project(c->op) && c->l &&
rel_find_exp(c->l, me->r)) {
pp = c;
c = c->l;
} else {
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -238,8 +238,9 @@ setConfVal(confkeyval *ckv, const char *
return(strdup(buf));
}
ival = sign * atoi(val);
- }; break;
- case BOOLEAN: {
+ break;
+ }
+ case BOOLEAN:
if (strcasecmp(val, "true") == 0 ||
strcasecmp(val, "yes") == 0 ||
strcmp(val, "1") == 0)
@@ -259,8 +260,8 @@ setConfVal(confkeyval *ckv, const char *
ckv->key, val);
return(strdup(buf));
}
- }; break;
- case MURI: {
+ break;
+ case MURI:
if (strncmp(val, "mapi:monetdb://",
sizeof("mapi:monetdb://") -1)
!= 0)
{
@@ -271,8 +272,8 @@ setConfVal(confkeyval *ckv, const char *
return(strdup(buf));
}
/* TODO: check full URL? */
- }; break;
- case LADDR: {
+ break;
+ case LADDR:
if (strncmp(val, "127.0.0.1", strlen("127.0.0.1")) != 0
&&
strncmp(val, "0.0.0.0", strlen("0.0.0.0")) != 0
&&
strncmp(val, "::", 2) != 0 &&
@@ -286,8 +287,8 @@ setConfVal(confkeyval *ckv, const char *
ckv->key);
return(strdup(buf));
}
- }; break;
- case LOGLEVEL: {
+ break;
+ case LOGLEVEL:
if (strcasecmp(val, "error") == 0) {
val = "error";
ival = ERROR;
@@ -303,7 +304,7 @@ setConfVal(confkeyval *ckv, const char *
} else {
return(strdup("allowed loglevel values are:
error or warning or information or debug\n"));
}
- }; break;
+ break;
case MODS:
for (size_t i = 0; val[i]; i++) {
if (val[i] < ' ' || val[i] == '\\' || val[i] ==
'/' || val[i] >= 0177)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
