Changeset: f4e8adbfb7ec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4e8adbfb7ec
Modified Files:
sql/backends/monet5/sql.c
tools/merovingian/daemon/controlrunner.c
Branch: default
Log Message:
small compilation fixes
diffs (65 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4096,7 +4096,7 @@ month_interval(Client cntxt, MalBlkPtr m
int k = digits2ek(*getArgReference_int(stk, pci, 2)), tpe =
getArgType(mb, pci, 1);
bool is_a_bat = false;
BAT *b = NULL, *res = NULL;
- bat *r;
+ bat *r = NULL;
BUN q = 0;
(void) cntxt;
@@ -4192,7 +4192,7 @@ second_interval(Client cntxt, MalBlkPtr
int tpe = getArgType(mb, pci, 1), k =
digits2ek(*getArgReference_int(stk, pci, 2)), scale = 0;
bool is_a_bat = false;
BAT *b = NULL, *res = NULL;
- bat *r;
+ bat *r = NULL;
BUN q = 0;
(void) cntxt;
@@ -6323,19 +6323,19 @@ static mel_func sql_init_funcs[] = {
command("sql", "round", sht_round_wrap, false, "round off the decimal v(d,s)
to r digits behind the dot (if r < 0, before the dot)", args(1,5,
arg("",sht),arg("v",sht),arg("d",int),arg("s",int),arg("r",bte))),
command("batsql", "round", sht_bat_round_wrap, false, "round off the decimal
v(d,s) to r digits behind the dot (if r < 0, before the dot)", args(1,5,
batarg("",sht),batarg("v",sht),arg("d",int),arg("s",int),arg("r",bte))),
command("calc", "second_interval", sht_dec2second_interval, false, "cast sht
decimal to a second_interval", args(1,5,
arg("",lng),arg("sc",int),arg("v",sht),arg("ek",int),arg("sk",int))),
- command("batcalc", "second_interval", sht_batdec2second_interval, false,
"cast sht decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",sht),arg("ek",int),arg("sk",int))),
+ command("batcalc", "second_interval", sht_batdec2second_interval, false,
"cast sht decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",sht),arg("ek",int),arg("sk",int))),
command("sql", "dec_round", int_dec_round_wrap, false, "round off the value v
to nearests multiple of r", args(1,3, arg("",int),arg("v",int),arg("r",int))),
command("batsql", "dec_round", int_bat_dec_round_wrap, false, "round off the
value v to nearests multiple of r", args(1,3,
batarg("",int),batarg("v",int),arg("r",int))),
command("sql", "round", int_round_wrap, false, "round off the decimal v(d,s)
to r digits behind the dot (if r < 0, before the dot)", args(1,5,
arg("",int),arg("v",int),arg("d",int),arg("s",int),arg("r",bte))),
command("batsql", "round", int_bat_round_wrap, false, "round off the decimal
v(d,s) to r digits behind the dot (if r < 0, before the dot)", args(1,5,
batarg("",int),batarg("v",int),arg("d",int),arg("s",int),arg("r",bte))),
command("calc", "second_interval", int_dec2second_interval, false, "cast int
decimal to a second_interval", args(1,5,
arg("",lng),arg("sc",int),arg("v",int),arg("ek",int),arg("sk",int))),
- command("batcalc", "second_interval", int_batdec2second_interval, false,
"cast int decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",int),arg("ek",int),arg("sk",int))),
+ command("batcalc", "second_interval", int_batdec2second_interval, false,
"cast int decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",int),arg("ek",int),arg("sk",int))),
command("sql", "dec_round", lng_dec_round_wrap, false, "round off the value v
to nearests multiple of r", args(1,3, arg("",lng),arg("v",lng),arg("r",lng))),
command("batsql", "dec_round", lng_bat_dec_round_wrap, false, "round off the
value v to nearests multiple of r", args(1,3,
batarg("",lng),batarg("v",lng),arg("r",lng))),
command("sql", "round", lng_round_wrap, false, "round off the decimal v(d,s)
to r digits behind the dot (if r < 0, before the dot)", args(1,5,
arg("",lng),arg("v",lng),arg("d",int),arg("s",int),arg("r",bte))),
command("batsql", "round", lng_bat_round_wrap, false, "round off the decimal
v(d,s) to r digits behind the dot (if r < 0, before the dot)", args(1,5,
batarg("",lng),batarg("v",lng),arg("d",int),arg("s",int),arg("r",bte))),
command("calc", "second_interval", lng_dec2second_interval, false, "cast lng
decimal to a second_interval", args(1,5,
arg("",lng),arg("sc",int),arg("v",lng),arg("ek",int),arg("sk",int))),
- command("batcalc", "second_interval", lng_batdec2second_interval, false,
"cast lng decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",lng),arg("ek",int),arg("sk",int))),
+ command("batcalc", "second_interval", lng_batdec2second_interval, false,
"cast lng decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",lng),arg("ek",int),arg("sk",int))),
command("sql", "dec_round", flt_dec_round_wrap, false, "round off the value v
to nearests multiple of r", args(1,3, arg("",flt),arg("v",flt),arg("r",flt))),
command("batsql", "dec_round", flt_bat_dec_round_wrap, false, "round off the
value v to nearests multiple of r", args(1,3,
batarg("",flt),batarg("v",flt),arg("r",flt))),
command("sql", "round", flt_round_wrap, false, "round off the floating point
v to r digits behind the dot (if r < 0, before the dot)", args(1,3,
arg("",flt),arg("v",flt),arg("r",bte))),
@@ -7157,7 +7157,7 @@ static mel_func sql_init_funcs[] = {
command("sql", "round", hge_round_wrap, false, "round off the decimal v(d,s)
to r digits behind the dot (if r < 0, before the dot)", args(1,5,
arg("",hge),arg("v",hge),arg("d",int),arg("s",int),arg("r",bte))),
command("batsql", "round", hge_bat_round_wrap, false, "round off the decimal
v(d,s) to r digits behind the dot (if r < 0, before the dot)", args(1,5,
batarg("",hge),batarg("v",hge),arg("d",int),arg("s",int),arg("r",bte))),
command("calc", "second_interval", hge_dec2second_interval, false, "cast hge
decimal to a second_interval", args(1,5,
arg("",lng),arg("sc",int),arg("v",hge),arg("ek",int),arg("sk",int))),
- command("batcalc", "second_interval", hge_batdec2second_interval, false,
"cast hge decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",hge),arg("ek",int),arg("sk",int))),
+ command("batcalc", "second_interval", hge_batdec2second_interval, false,
"cast hge decimal to a second_interval", args(1,5,
batarg("",lng),arg("sc",int),batarg("v",hge),arg("ek",int),arg("sk",int))),
command("calc", "hge", nil_2dec_hge, false, "cast to dec(hge) and check for
overflow", args(1,4,
arg("",hge),arg("v",void),arg("digits",int),arg("scale",int))),
command("batcalc", "hge", batnil_2dec_hge, false, "cast to dec(hge) and check
for overflow", args(1,4,
batarg("",hge),batarg("v",void),arg("digits",int),arg("scale",int))),
command("batcalc", "hge", batnil_ce_2dec_hge, false, "cast to dec(hge) and
check for overflow", args(1,5,
batarg("",hge),batarg("v",void),arg("digits",int),arg("scale",int),batarg("r",bit))),
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -351,7 +351,7 @@ static void ctl_handle_client(
strcmp(p, "kill") == 0)
{
mtype mtype = 0;
- pid_t pid;
+ pid_t pid = 0;
// First look for something started by ourself.
pthread_mutex_lock(&_mero_topdp_lock);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
