Changeset: 53c6676dc182 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53c6676dc182
Modified Files:
clients/mapiclient/dump.c
common/utils/msabaoth.c
gdk/gdk_imprints.h
geom/monetdb5/geom.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/clients.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_decimal.c
sql/server/sql_env.c
sql/storage/store.c
testing/difflib.c
Branch: Oct2014
Log Message:
No need for ... ? 1 : 0. Ever.
The expression (T ? 1 : 0) is exactly equivalent to (T != 0).
Moreover, if T is already a Boolean expression, it is equivalent to
just T. Similarly, (T ? 0 : 1) is equivalent to (T == 0).
diffs (truncated from 316 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1284,7 +1284,7 @@ dump_functions(Mapi mid, stream *toConso
if (schema)
free(schema);
mapi_close_handle(hdl);
- return mnstr_errnr(toConsole) ? 1 : 0;
+ return mnstr_errnr(toConsole) != 0;
bailout:
if (schema)
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -804,7 +804,7 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(&avg10[0], &avg10[1],
sizeof(int) * 9);
memmove(&avg30[0], &avg30[1],
sizeof(int) * 29);
avg10[9] = avg30[29] = ret->crashavg1 =
- (start != 0 ? 1 : 0);
+ (start != 0);
*p = '\0';
ret->laststart = start =
(time_t)atol(data);
p = data;
@@ -834,9 +834,9 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(&avg10[0], &avg10[1], sizeof(int) * 9);
memmove(&avg30[0], &avg30[1], sizeof(int) * 29);
avg10[9] = avg30[29] = ret->crashavg1 =
- (start != 0 ? (db->state != SABdbRunning ? 1 : 0) : 0);
+ (start != 0 ? (db->state != SABdbRunning) : 0);
ret->crashcntr =
- ret->startcntr - (db->state == SABdbRunning ? 1 : 0) -
+ ret->startcntr - (db->state == SABdbRunning) -
ret->stopcntr;
for (i = 0; i < 10; i++)
ret->crashavg10 += avg10[i];
diff --git a/gdk/gdk_imprints.h b/gdk/gdk_imprints.h
--- a/gdk/gdk_imprints.h
+++ b/gdk/gdk_imprints.h
@@ -37,12 +37,12 @@ typedef struct {
#define IMPScnt(X) ((X) & 16777215) /* 24 bits for cnt */
#define IMPSsetcnt(X,Y) ((X) = (Y)) /* no overflow check */
#define IMPScnt_inc(X) ((X)++) /* no overflow check */
-#define IMPSrepeat(X) (((X) & 16777216)?1:0)
+#define IMPSrepeat(X) (((X) & 16777216) != 0)
#define IMPSsetrepeat(X) ((X) |= 16777216)
#define IMPSunsetrepeat(X) ((X) &= (~16777216))
#define IMPSsetBit(B,X,Y) ((((uint##B##_t)1)<<(Y))|(X))
#define IMPSunsetBit(B,X,Y) ((~(((uint##B##_t)1)<<(Y)))&(X))
-#define IMPSisSet(B,X,Y) (((((uint##B##_t)1)<<Y)&X)?1:0)
+#define IMPSisSet(B,X,Y) (((((uint##B##_t)1)<<Y)&X) != 0)
#define IMPSmod2(X,Y) ((X)&((Y)-1))
#endif /* GDK_IMPS_H */
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -257,12 +257,12 @@ mbrCOMP(mbr *l, mbr *r)
/* simple lexicographical ordering on (x,y) */
int res;
if (l->xmin == r->xmin)
- res = (l->ymin < r->ymin) ? -1 : (l->ymin == r->ymin) ? 0 : 1;
+ res = (l->ymin < r->ymin) ? -1 : (l->ymin != r->ymin);
else
res = (l->xmin < r->xmin) ? -1 : 1;
if (res == 0) {
if (l->xmax == r->xmax)
- res = (l->ymax < r->ymax) ? -1 : (l->ymax == r->ymax) ?
0 : 1;
+ res = (l->ymax < r->ymax) ? -1 : (l->ymax != r->ymax);
else
res = (l->xmax < r->xmax) ? -1 : 1;
}
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -2202,7 +2202,7 @@ ALGexist(bit *ret, int *bid, ptr val)
}
derefStr(b, h, val);
q = BUNfnd(BATmirror(b), val);
- *ret = (q != BUN_NONE) ? 1 : 0;
+ *ret = (q != BUN_NONE);
BBPreleaseref(b->batCacheid);
return MAL_SUCCEED;
}
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -1694,7 +1694,7 @@ BKCisSynced(bit *ret, int *bid1, int *bi
BBPreleaseref(b1->batCacheid);
throw(MAL, "bat.isSynced", RUNTIME_OBJECT_MISSING);
}
- *ret = ALIGNsynced(b1, b2) ? 1 : 0;
+ *ret = ALIGNsynced(b1, b2) != 0;
BBPreleaseref(b1->batCacheid);
BBPreleaseref(b2->batCacheid);
return MAL_SUCCEED;
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -625,7 +625,7 @@ CLTsessions(Client cntxt, MalBlkPtr mb,
MT_lock_set(&mal_contextLock, "clients.sessions");
- for (c = mal_clients + (GDKgetenv_isyes("monet_daemon")?1:0); c <
mal_clients + MAL_MAXCLIENTS; c++)
+ for (c = mal_clients + (GDKgetenv_isyes("monet_daemon") != 0); c <
mal_clients + MAL_MAXCLIENTS; c++)
if (c->mode == RUNCLIENT) {
BUNappend(user, &usrname, FALSE);
msg = MTIMEunix_epoch(&ts);
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -556,8 +556,8 @@ mat_join2(MalBlkPtr mb, InstrPtr p, mat_
}
} else {
int mv = (m>=0)?m:n;
- int av = (m>=0)?0:1;
- int bv = (m>=0)?1:0;
+ int av = (m<0);
+ int bv = (m>=0);
for(k=1; k<mat[mv].mi->argc; k++) {
InstrPtr q = copyInstruction(p);
@@ -622,8 +622,8 @@ mat_join3(MalBlkPtr mb, InstrPtr p, mat_
}
} else {
int mv = (m>=0)?m:n;
- int av = (m>=0)?0:1;
- int bv = (m>=0)?1:0;
+ int av = (m<0);
+ int bv = (m>=0);
for(k=1; k<mat[mv].mi->argc; k++) {
InstrPtr q = copyInstruction(p);
diff --git a/sql/backends/monet5/datacell/sensor.c
b/sql/backends/monet5/datacell/sensor.c
--- a/sql/backends/monet5/datacell/sensor.c
+++ b/sql/backends/monet5/datacell/sensor.c
@@ -563,7 +563,7 @@ produceStream(Sensor se)
}
/* we only generate integer based events for now */
- for (i = (timestamp ? 1 : 0) + (autoincrement ? 1 : 0);
i < columns; i++) {
+ for (i = (timestamp != 0) + (autoincrement != 0); i <
columns; i++) {
if (i)
snprintf(tuple + tlen, maxtuple - tlen,
"%s%d", separator[protocol], rand());
else
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1040,7 +1040,7 @@ static int
q = pushArgument(mb, q, g);
q = pushArgument(mb, q, topn);
q = pushBit(mb, q, dir != 0);
- q = pushBit(mb, q, distinct?1:0);
+ q = pushBit(mb, q, distinct != 0);
if (q == NULL)
return -1;
@@ -1102,7 +1102,7 @@ static int
} break;
case st_order:{
int l = _dumpstmt(sql, mb, s->op1);
- int reverse = (s->flag > 0) ? 0 : 1;
+ int reverse = (s->flag <= 0);
if (l < 0)
return -1;
@@ -1132,7 +1132,7 @@ static int
return -1;
if ((ogrp = _dumpstmt(sql, mb, s->op3)) < 0)
return -1;
- reverse = (s->flag > 0) ? 0 : 1;
+ reverse = (s->flag <= 0);
q = newStmt1(mb, algebraRef, "subsort");
/* both ordered result and oid's order en subgroups */
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1982,7 +1982,7 @@ SQLparser(Client c)
int commit;
v = (int) strtol(in->buf + in->pos + 12, NULL, 10);
commit = (!m->session->auto_commit && v);
- m->session->auto_commit = (v) ? 1 : 0;
+ m->session->auto_commit = (v) != 0;
m->session->ac_on_commit = m->session->auto_commit;
if (m->session->active) {
if (commit && mvc_commit(m, 0, NULL) < 0) {
diff --git a/sql/server/rel_planner.c b/sql/server/rel_planner.c
--- a/sql/server/rel_planner.c
+++ b/sql/server/rel_planner.c
@@ -120,7 +120,7 @@ memoitem_create( list *memo, sql_allocat
mi = SA_NEW(sa, memoitem);
mi->name = sa_strdup(sa, name);
mi->joins = (rname)?sa_list(sa):NULL;
- mi->done = (rname)?0:1;
+ mi->done = (rname == NULL);
mi->level = level;
mi->count = 0;
mi->cost = 0;
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -335,7 +335,7 @@ column_constraint_type(mvc *sql, char *n
} break;
case SQL_NOT_NULL:
case SQL_NULL: {
- int null = (s->token == SQL_NOT_NULL) ? 0 : 1;
+ int null = (s->token != SQL_NOT_NULL);
mvc_null(sql, cs, null);
res = SQL_OK;
@@ -403,7 +403,7 @@ column_option(
} break;
case SQL_NOT_NULL:
case SQL_NULL: {
- int null = (s->token == SQL_NOT_NULL) ? 0 : 1;
+ int null = (s->token != SQL_NOT_NULL);
mvc_null(sql, cs, null);
res = SQL_OK;
@@ -693,7 +693,7 @@ table_element(mvc *sql, symbol *s, sql_s
dnode *n = s->data.lval->h;
char *cname = n->data.sval;
sql_column *c = mvc_bind_column(sql, t, cname);
- int null = (s->token == SQL_NOT_NULL) ? 0 : 1;
+ int null = (s->token != SQL_NOT_NULL);
if (!c) {
sql_error(sql, 02, "42S22!ALTER TABLE: no such column
'%s'\n", cname);
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1066,7 +1066,7 @@ rel_import(mvc *sql, sql_table *t, char
sql_subtype tpe;
sql_exp *import;
sql_schema *sys = mvc_bind_schema(sql, "sys");
- int len = 7 + (filename?1:0);
+ int len = 7 + (filename != NULL);
sql_subfunc *f = sql_find_func(sql->sa, sys, "copyfrom", len, F_UNION);
if (!f) /* we do expect copyfrom to be there */
diff --git a/sql/server/sql_decimal.c b/sql/server/sql_decimal.c
--- a/sql/server/sql_decimal.c
+++ b/sql/server/sql_decimal.c
@@ -47,7 +47,7 @@ char *
decimal_to_str(lng v, sql_subtype *t)
{
char buf[32];
- int scale = t->scale, cur = 31, neg = (v<0)?1:0, i, done = 0;
+ int scale = t->scale, cur = 31, neg = (v<0), i, done = 0;
if (v<0) v = -v;
diff --git a/sql/server/sql_env.c b/sql/server/sql_env.c
--- a/sql/server/sql_env.c
+++ b/sql/server/sql_env.c
@@ -85,7 +85,7 @@ sql_update_var(mvc *m, char *name, char
m->cache = (int) sgn;
} else if (strcmp(name, "history") == 0) {
assert((lng) GDK_int_min <= sgn && sgn <= (lng) GDK_int_max);
- m->history = (int) (sgn)?1:0;
+ m->history = (sgn != 0);
}
return NULL;
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -749,7 +749,7 @@ load_func(sql_trans *tr, sql_schema *s,
v = table_funcs.column_find_value(tr, find_sql_column(funcs,
"language"), rid);
t->lang = *(int *)v; _DELETE(v);
v = table_funcs.column_find_value(tr, find_sql_column(funcs, "type"),
rid);
- t->sql = (t->lang==FUNC_LANG_SQL||t->lang==FUNC_LANG_MAL)?1:0;
+ t->sql = (t->lang==FUNC_LANG_SQL||t->lang==FUNC_LANG_MAL);
t->type = *(int *)v; _DELETE(v);
v = table_funcs.column_find_value(tr, find_sql_column(funcs,
"side_effect"), rid);
t->side_effect = *(bit *)v; _DELETE(v);
@@ -3710,7 +3710,7 @@ create_sql_func(sql_allocator *sa, char
t->mod = (mod)?sa_strdup(sa, mod):NULL;
t->type = type;
t->lang = lang;
- t->sql = (lang==FUNC_LANG_SQL||lang==FUNC_LANG_MAL)?1:0;
+ t->sql = (lang==FUNC_LANG_SQL||lang==FUNC_LANG_MAL);
t->side_effect = res?FALSE:TRUE;
t->varres = varres;
t->vararg = vararg;
@@ -3738,7 +3738,7 @@ sql_trans_create_func(sql_trans *tr, sql
t->mod = (mod)?sa_strdup(tr->sa, mod):NULL;
t->type = type;
t->lang = lang;
- t->sql = (lang==FUNC_LANG_SQL||lang==FUNC_LANG_MAL)?1:0;
+ t->sql = (lang==FUNC_LANG_SQL||lang==FUNC_LANG_MAL);
se = t->side_effect = res?FALSE:TRUE;
t->varres = varres;
t->vararg = vararg;
diff --git a/testing/difflib.c b/testing/difflib.c
--- a/testing/difflib.c
+++ b/testing/difflib.c
@@ -583,7 +583,7 @@ lwc_diff2html(char *old_fn, char *new_fn
char nl = line[sl], l0, l1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
