Changeset: 7a93cad9e2b6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7a93cad9e2b6
Modified Files:
clients/mapiclient/mclient.c
gdk/gdk_string.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_pushselect.c
sql/storage/store.c
Branch: Mar2025
Log Message:
More simplify struct initializations.
diffs (133 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3934,8 +3934,7 @@ main(int argc, char **argv)
}
}
- struct privdata priv;
- priv = (struct privdata) {.mid = mid};
+ struct privdata priv = {.mid = mid};
mapi_setfilecallback2(mid, getfile, putfile, &priv);
mapi_trace(mid, trace);
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -805,7 +805,7 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
BUN i, p, nils = 0;
size_t *restrict lengths = NULL, separator_length = 0, next_length;
str *restrict astrings = NULL;
- BATiter bi, bis = (BATiter) {0};
+ BATiter bi, bis = {0};
BAT *bn = NULL;
gdk_return rres = GDK_FAIL;
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -239,7 +239,7 @@ NAME##_bulk(Client cntxt, MalBlkPtr mb,
*bid2 = getArgReference_bat(stk, pci, 2),
\
*sid1 = pci->argc == 5 ? getArgReference_bat(stk, pci, 3) :
NULL, \
*sid2 = pci->argc == 5 ? getArgReference_bat(stk, pci, 4) :
NULL; \
- BATiter b1i, b2i = (BATiter){ .vh = NULL };
\
+ BATiter b1i, b2i = { .vh = NULL };
\
DEC_SRC1(INTYPE1, 1);
\
DEC_SRC2(INTYPE2, 2);
\
DEC_OUTPUT(OUTTYPE, n);
\
@@ -513,7 +513,7 @@ NAME##_bulk(Client cntxt, MalBlkPtr mb,
*sid1 = pci->argc == 6 ? getArgReference_bat(stk, pci, 3) :
NULL, \
*sid2 = pci->argc == 6 ? getArgReference_bat(stk, pci, 4) :
NULL; \
lng *extra = getArgReference_lng(stk, pci, pci->argc-1);
\
- BATiter b1i, b2i = (BATiter){ .vh = NULL };
\
+ BATiter b1i, b2i = { .vh = NULL };
\
DEC_SRC1(INTYPE1, 1);
\
DEC_SRC2(INTYPE2, 2);
\
DEC_OUTPUT(OUTTYPE, n);
\
@@ -1123,7 +1123,6 @@ timestamp_to_str_withtz(str *buf, const
{
date dt;
daytime t;
- struct tm tm;
if (is_timestamp_nil(*d) || strNil(*format)) {
strcpy(*buf, str_nil);
@@ -1131,7 +1130,7 @@ timestamp_to_str_withtz(str *buf, const
}
dt = timestamp_date(*d);
t = timestamp_daytime(*d);
- tm = (struct tm) {
+ struct tm tm = {
.tm_year = date_year(dt) - 1900,
.tm_mon = date_month(dt) - 1,
.tm_mday = date_day(dt),
diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -285,7 +285,6 @@ MANIFOLDtypecheck(Client cntxt, MalBlkPt
static str
MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- MULTItask mut;
MULTIarg *mat;
int i, tpe = 0;
BUN cnt = 0;
@@ -308,7 +307,7 @@ MANIFOLDevaluate(Client cntxt, MalBlkPtr
throw(MAL, "mal.manifold", SQLSTATE(HY013) MAL_MALLOC_FAIL);
// mr-job structure preparation
- mut = (MULTItask) {
+ MULTItask mut = {
.cntxt = cntxt,
.mb = mb,
.stk = stk,
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1569,7 +1569,6 @@ SQLload_file(Client cntxt, Tablet *as, b
int j;
BUN firstcol;
BUN i, attr;
- READERtask task;
READERtask ptask[MAXWORKERS];
int threads = 1;
lng tio, t1 = 0;
@@ -1586,7 +1585,7 @@ SQLload_file(Client cntxt, Tablet *as, b
/* TRC_DEBUG(MAL_SERVER, "Prepare copy work for '%d' threads col '%s' rec
'%s' quot '%c'\n", threads, csep, rsep, quote);*/
memset(ptask, 0, sizeof(ptask));
- task = (READERtask) {
+ READERtask task = {
.cntxt = cntxt,
.from_stdin = from_stdin,
.as = as,
diff --git a/monetdb5/optimizer/opt_pushselect.c
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -106,10 +106,9 @@ OPTpushselectImplementation(Client cntxt
no_mito = 0;
bool *rslices = NULL, *oclean = NULL;
InstrPtr p, *old = NULL;
- subselect_t subselects;
+ subselect_t subselects = { 0 };
str msg = MAL_SUCCEED;
- subselects = (subselect_t) { 0 };
if (mb->errors)
throw(MAL, "optimizer.pushselect", "%s", mb->errors);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -7699,10 +7699,9 @@ convert_part_values(sql_trans *tr, sql_t
if (isListPartitionTable(mt)) {
for (node *m = p->part.values->h; m; m =
m->next) {
sql_part_value *v = (sql_part_value*)
m->data, ov = *v;
- ValRecord vvalue;
+ ValRecord vvalue = {.vtype =
TYPE_void,};
ptr ok;
- vvalue = (ValRecord) {.vtype =
TYPE_void,};
ok = VALinit(&vvalue, TYPE_str,
v->value);
if (ok)
ok = VALconvert(localtype,
&vvalue);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
