Changeset: 48d15be47124 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48d15be47124
Modified Files:
gdk/gdk.h
gdk/gdk_project.c
monetdb5/mal/mal_instruction.c
Branch: default
Log Message:
A little cleanup.
diffs (46 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2090,7 +2090,7 @@ gdk_export str GDKstrndup(const char *s,
#define GDKfree(p) \
({ \
void *_ptr = (p); \
- ALLOCDEBUG \
+ ALLOCDEBUG if (_ptr) \
fprintf(stderr, \
"#GDKfree(" PTRFMT ")" \
" %s[%s:%d]\n", \
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -443,7 +443,7 @@ BATprojectchain(BAT **bats)
for (n = 0; bats[n]; n++)
;
ba = GDKmalloc(sizeof(*ba) * n);
- if( ba == NULL)
+ if (ba == NULL)
return NULL;
b = *bats++;
cnt = BATcount(b); /* this will be the size of the output */
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -30,14 +30,11 @@ newSymbol(str nme, int kind)
return NULL;
}
if( symboltop < MAXSYMBOLS){
- cur = symbolpool + symboltop;
- symboltop++;
- } else
+ cur = symbolpool + symboltop++;
+ } else {
cur = (Symbol) GDKzalloc(sizeof(SymRecord));
-
- if (cur == NULL) {
- GDKerror("newSymbol:" MAL_MALLOC_FAIL);
- return NULL;
+ if (cur == NULL)
+ return NULL;
}
cur->name = putName(nme);
cur->kind = kind;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
