Changeset: 2f34a48ae2fb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f34a48ae2fb
Modified Files:
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_project.c
gdk/gdk_system.h
gdk/gdk_value.c
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (105 lines):
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -656,7 +656,7 @@ BATfirstn_grouped(BAT **topn, BAT **gids
* can use the base type */
tpe = ATOMbasetype(tpe); /* takes care of oid */
groups = GDKmalloc(sizeof(*groups) * n);
- if( groups == NULL)
+ if (groups == NULL)
return GDK_FAIL;
oldcand = cand;
if (asc) {
@@ -962,7 +962,7 @@ BATfirstn_grouped_with_groups(BAT **topn
* can use the base type */
tpe = ATOMbasetype(tpe); /* takes care of oid */
groups = GDKmalloc(sizeof(*groups) * n);
- if( groups == NULL)
+ if (groups == NULL)
return GDK_FAIL;
gv = (const oid *) Tloc(g, 0);
oldcand = cand;
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -712,7 +712,7 @@ BATgroup_internal(BAT **groups, BAT **ex
const unsigned char *restrict w = (const unsigned char *)
Tloc(b, 0);
unsigned char v;
- if( bgrps == NULL)
+ if (bgrps == NULL)
goto error;
memset(bgrps, 0xFF, 256);
if (histo)
@@ -741,7 +741,7 @@ BATgroup_internal(BAT **groups, BAT **ex
const unsigned short *restrict w = (const unsigned short *)
Tloc(b, 0);
unsigned short v;
- if( sgrps == NULL)
+ if (sgrps == NULL)
goto error;
memset(sgrps, 0xFF, 65536 * sizeof(short));
if (histo)
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1219,7 +1219,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
BATiter iter = (list_nme)?bat_iterator(list_nme):bat_iterator(list_bid);
gdk_return res;
- if( n == NULL)
+ if (n == NULL)
return GDK_FAIL;
n[i++] = 0; /* n[0] is not used */
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -582,12 +582,12 @@ MT_mremap(const char *path, int mode, vo
if (fd >= 0)
close(fd);
p = malloc(strlen(path) + 5);
- if ( p == NULL){
+ if (p == NULL){
GDKsyserror("MT_mremap:
malloc() failed\n");
fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): fd < 0\n", __FILE__, __LINE__, path,
PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
-
+
strcat(strcpy(p, path), ".tmp");
fd = open(p, O_RDWR | O_CREAT,
MONETDB_MODE);
@@ -1054,7 +1054,7 @@ reduce_dir_name(const char *src, char *d
if (len >= cap)
buf = malloc(len + 1);
- if( buf == NULL)
+ if (buf == NULL)
return NULL;
while (--len > 0 && src[len - 1] != ':' && src[len] == DIR_SEP)
;
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -230,7 +230,7 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
_p = GDKmalloc(sizeof(MT_Lock)); \
while (ATOMIC_TAS(GDKlocklistlock, dummy) != 0) \
; \
- if( _p) { \
+ if (_p) { \
memcpy(_p, l, sizeof(MT_Lock)); \
_p->next = GDKlocklist; \
GDKlocklist = _p; \
diff --git a/gdk/gdk_value.c b/gdk/gdk_value.c
--- a/gdk/gdk_value.c
+++ b/gdk/gdk_value.c
@@ -157,7 +157,7 @@ VALcopy(ValPtr d, const ValRecord *s)
d->vtype = s->vtype;
d->len = ATOMlen(d->vtype, p);
d->val.pval = GDKmalloc(d->len);
- if( d->val.pval)
+ if (d->val.pval)
memcpy(d->val.pval, p, d->len);
}
return d;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
