Changeset: 5fe5d109a991 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fe5d109a991
Modified Files:
gdk/gdk_posix.c
Branch: Oct2014
Log Message:
If we check that path is not NULL, we don't need to keep doing that.
diffs (36 lines):
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -420,12 +420,12 @@ MT_mremap(const char *path, int mode, vo
/* "normal" memory map */
if ((fd = open(path, O_RDWR)) < 0) {
- fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): open() failed\n", __FILE__, __LINE__,
path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
+ fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): open() failed\n", __FILE__, __LINE__,
path, PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
if (GDKextendf(fd, *new_size, path) < 0) {
close(fd);
- fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): GDKextendf() failed\n", __FILE__,
__LINE__, path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
+ fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): GDKextendf() failed\n", __FILE__,
__LINE__, path, PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
#ifdef HAVE_MREMAP
@@ -535,7 +535,7 @@ MT_mremap(const char *path, int mode, vo
MONETDB_MODE);
free(p);
if (fd < 0) {
- fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): fd < 0\n", __FILE__, __LINE__,
path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
+ 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;
}
if (write(fd, old_address,
@@ -563,7 +563,7 @@ MT_mremap(const char *path, int mode, vo
#else
"ftruncate()"
#endif
- " failed\n", __FILE__,
__LINE__, path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
+ " failed\n", __FILE__,
__LINE__, path, PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
p = mmap(NULL, *new_size, prot, flags,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
