Changeset: 007f95d97283 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=007f95d97283
Modified Files:
gdk/gdk_bbp.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_function.c
monetdb5/optimizer/opt_wrapper.c
Branch: default
Log Message:
Backed out changeset 262fca1a48ba
diffs (92 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -644,9 +644,9 @@ BBPreadEntries(FILE *fp, unsigned bbpver
bn->batInserted = bn->batCount;
bn->batCapacity = (BUN) capacity;
char name[MT_NAME_LEN];
- int_to_str(stpcpy(name, "heaplock"), bn->batCacheid); /* fits */
+ snprintf(name, sizeof(name), "heaplock%d", bn->batCacheid); /*
fits */
MT_lock_init(&bn->theaplock, name);
- int_to_str(stpcpy(name, "BATlock"), bn->batCacheid); /* fits */
+ snprintf(name, sizeof(name), "BATlock%d", bn->batCacheid); /*
fits */
MT_lock_init(&bn->batIdxLock, name);
ATOMIC_INIT(&bn->theap->refs, 1);
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -496,8 +496,7 @@ DFLOWinitialize(void)
}
for (i = 0; i < THREADS; i++) {
char name[MT_NAME_LEN];
- int_to_str(stpcpy(name, "DFLOWsema"), i); /* should fit */
- assert(strlen(name) < MT_NAME_LEN);
+ snprintf(name, sizeof(name), "DFLOWsema%d", i);
MT_sema_init(&workers[i].s, 0, name);
workers[i].flag = IDLE;
if (first) /* only initialize once
*/
@@ -517,8 +516,7 @@ DFLOWinitialize(void)
workers[i].flag = RUNNING;
ATOMIC_PTR_SET(&workers[i].cntxt, NULL);
char name[MT_NAME_LEN];
- int_to_str(stpcpy(name, "DFLOWworker"), i); /* should fit */
- assert(strlen(name) < MT_NAME_LEN);
+ snprintf(name, sizeof(name), "DFLOWworker%d", i);
if ((workers[i].id = THRcreate(DFLOWworker, (void *)
&workers[i], MT_THR_JOINABLE, name)) == 0) {
GDKfree(workers[i].errbuf);
workers[i].errbuf = NULL;
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -100,16 +100,11 @@ chkFlow(MalBlkPtr mb)
int endseen=0, retseen=0, yieldseen=0;
InstrPtr p;
str msg = MAL_SUCCEED;
- size_t pos;
if ( mb->errors != MAL_SUCCEED)
return mb->errors ;
p = getInstrPtr(mb, 0);
-
- pos = strcpy_len(buf, getModuleId(p), sizeof(buf));
- pos += strcpy_len(buf, ".", sizeof(buf) - pos);
- strcpy_len(buf, getFunctionId(p), sizeof(buf) - pos);
-
+ snprintf(buf, IDLENGTH * 2 +2, "%s.%s", getModuleId(p),
getFunctionId(p));
lastInstruction = mb->stop-1;
for(i= 0; i<mb->stop; i++){
p= getInstrPtr(mb,i);
@@ -681,7 +676,6 @@ chkDeclarations(MalBlkPtr mb){
int dflow = -1;
char buf[IDLENGTH * 2 +2];
str msg = MAL_SUCCEED;
- size_t pos;
if( mb->errors)
return GDKstrdup(mb->errors);
@@ -695,10 +689,7 @@ chkDeclarations(MalBlkPtr mb){
p= getInstrPtr(mb,0);
for(k=0;k<p->argc; k++)
setVarScope(mb, getArg(p,k), blkId);
-
- pos = strcpy_len(buf, getModuleId(p), sizeof(buf));
- pos += strcpy_len(buf, ".", sizeof(buf) - pos);
- strcpy_len(buf, getFunctionId(p), sizeof(buf) - pos);
+ snprintf(buf, IDLENGTH * 2 +2, "%s.%s", getModuleId(p),
getFunctionId(p));
for(pc=1;pc<mb->stop; pc++){
p= getInstrPtr(mb,pc);
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -116,8 +116,7 @@ str OPTwrapper (Client cntxt, MalBlkPtr
if( mb->errors)
throw(MAL, "opt_wrapper", SQLSTATE(42000) "MAL block contains
errors");
- fcnnme = getFunctionId(p);
- strcpy_len(optimizer, fcnnme, sizeof(optimizer));
+ snprintf(optimizer,256,"%s", fcnnme = getFunctionId(p));
if( p && p->argc > 1 ){
if( getArgType(mb,p,1) != TYPE_str ||
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
