Changeset: 03567e25cdd5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03567e25cdd5
Modified Files:
gdk/gdk.h
Branch: default
Log Message:
Fix GDKstrndup debug macros.
diffs (39 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2324,15 +2324,16 @@ gdk_export str GDKstrndup(const char *s,
__func__, __FILE__, __LINE__); \
_res; \
})
-#define GDKstrndup(s,n)
\
+#define GDKstrndup(s, n) \
({ \
const char *_str = (s); \
- void *_res = GDKstrndup(_str,n);
\
+ size_t _n = (n); \
+ void *_res = GDKstrndup(_str, _n); \
ALLOCDEBUG \
fprintf(stderr, \
"#GDKstrndup(len=" SZFMT ") -> " PTRFMT \
" %s[%s:%d]\n", \
- n, \
+ _n, \
PTRFMTCAST _res, \
__func__, __FILE__, __LINE__); \
_res; \
@@ -2455,13 +2456,13 @@ GDKstrdup_debug(const char *str, const c
static inline char *
GDKstrndup_debug(const char *str, size_t n, const char *filename, int lineno)
{
- void *res = GDKstrndup(str,n);
+ void *res = GDKstrndup(str, n);
ALLOCDEBUG fprintf(stderr, "#GDKstrndup(len=" SZFMT ") -> "
PTRFMT " [%s:%d]\n",
n, PTRFMTCAST res, filename, lineno);
return res;
}
-#define GDKstrndup(s) GDKstrndup_debug((s), __FILE__, __LINE__)
+#define GDKstrndup(s, n) GDKstrndup_debug((s), (n), __FILE__, __LINE__)
static inline void *
GDKmmap_debug(const char *path, int mode, size_t len, const char *filename,
int lineno)
{
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
