X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fassert.hpp;h=cd4a194b2b1ce305e074e5f090ca82abead4d2ee;hb=73e1288b648b5394239e0cefd2251fedfa9727af;hp=acd0198e3df52848cefa876a36068ea822f0a730;hpb=0a45c8bafd621482cb08f2e5f792f42cafb13865;p=awesomized%2Flibmemcached

diff --git a/libmemcached/assert.hpp b/libmemcached/assert.hpp
index acd0198e..cd4a194b 100644
--- a/libmemcached/assert.hpp
+++ b/libmemcached/assert.hpp
@@ -2,7 +2,7 @@
  * 
  *  libmcachedd client library.
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -37,22 +37,57 @@
 
 #pragma once
 
-#include <cstdlib>
-#include <cstdio>
+#ifdef __cplusplus
+# include <cassert>
+#else
+# include <assert.h>
+#endif // __cplusplus
 
 #ifdef NDEBUG
-#define	assert(__expr, __mesg)	((void)0)
+# define assert_msg(__expr, __mesg) (void)(__expr); (void)(__mesg);
+# define assert_vmsg(__expr, __mesg, ...) (void)(__expr); (void)(__mesg);
+#else
+
+# ifdef _WIN32
+#  include <malloc.h>
+# else
+#  include <alloca.h>
+# endif
+
+#ifdef __cplusplus
+# include <cstdarg>
+# include <cstdio>
 #else
+# include <stdarg.h>
+# include <stdio.h>
+#endif
+
+# include <libmemcached/backtrace.hpp>
 
-#define assert_msg(__expr, __mesg) \
+# define assert_msg(__expr, __mesg) \
 do \
 { \
   if (not (__expr)) \
   { \
-    fprintf(stderr, "\nAssertion \"%s\" failed for function \"%s\" likely for %s, at %s:%d\n", #__expr, __func__, (#__mesg),  __FILE__, __LINE__);\
+    fprintf(stderr, "\n%s:%d Assertion \"%s\" failed for function \"%s\" likely for %s\n", __FILE__, __LINE__, #__expr, __func__, (#__mesg));\
     custom_backtrace(); \
     abort(); \
   } \
 } while (0)
 
-#endif
+# define assert_vmsg(__expr, __mesg, ...) \
+do \
+{ \
+  if (not (__expr)) \
+  { \
+    size_t ask= snprintf(0, 0, (__mesg), __VA_ARGS__); \
+    ask++; \
+    char *_error_message= (char*)alloca(sizeof(char) * ask); \
+    size_t _error_message_size= snprintf(_error_message, ask, (__mesg), __VA_ARGS__); \
+    fprintf(stderr, "\n%s:%d Assertion '%s' failed for function '%s' [ %.*s ]\n", __FILE__, __LINE__, #__expr, __func__, int(_error_message_size), _error_message);\
+    custom_backtrace(); \
+    abort(); \
+  } \
+} while (0)
+
+#endif // NDEBUG