X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Fmem.h;h=a405e306180deaf30fb0686a6e6129ff79381b94;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hp=c1eb0b1cdb77237660157f01adc40fe2cbfa4623;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a;p=apps%2Fmadmutt.git

diff --git a/lib-lib/mem.h b/lib-lib/mem.h
index c1eb0b1..a405e30 100644
--- a/lib-lib/mem.h
+++ b/lib-lib/mem.h
@@ -1,19 +1,20 @@
 /*
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation; either version 2 of the License, or (at your option)
- *  any later version.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA 02110-1301, USA.
  *
- * Author: Pierre Habouzit <madcoder@debian.org>
+ *  Copyright © 2006 Pierre Habouzit
  */
 
 #ifndef MUTT_LIB_LIB_MEM_H
@@ -23,49 +24,20 @@
 #include <string.h>
 #include <unistd.h>
 
-static inline void *xmalloc(ssize_t size) {
-    void *mem;
-
-    if (size <= 0)
-        return NULL;
-
-    mem = calloc(size, 1);
-    if (!mem)
-        abort();
-    return mem;
-}
-
-static inline void *xrealloc(void *mem, ssize_t newsize) {
-    mem = realloc(mem, newsize);
-    if (!mem)
-        abort();
-    return mem;
-}
-
-static inline void *xmemdup(const void *src, ssize_t size) {
-    return memcpy(xmalloc(size), src, size);
-}
-
-static inline void *xmemdupstr(const void *src, ssize_t len) {
-    char *res = xmalloc(len + 1);
-    memcpy(res, src, len);
-    res[len] = '\0';
-    return res;
-}
-
 #define p_new(type, count)      ((type *)xmalloc(sizeof(type) * (count)))
 #define p_clear(p, count)       ((void)memset((p), 0, sizeof(*(p)) * (count)))
 #define p_dup(p, count)         xmemdup((p), sizeof(*(p)) * (count))
 #define p_dupstr(p, len)        xmemdupstr((p), (len))
+#define p_realloc(pp, count)    xrealloc((void*)(pp), sizeof(**(pp)) * (count))
 
 #ifdef __GNUC__
 
 #  define p_delete(mem_pp)                          \
-        ({                                          \
+        do {                                        \
             typeof(**(mem_pp)) **__ptr = (mem_pp);  \
             free(*__ptr);                           \
             *__ptr = NULL;                          \
-        })
+        } while(0)
 
 #else
 
@@ -78,8 +50,40 @@ static inline void *xmemdupstr(const void *src, ssize_t len) {
 
 #endif
 
+static inline void *xmalloc(ssize_t size) {
+    void *mem;
+
+    if (size <= 0)
+        return NULL;
+
+    mem = calloc(size, 1);
+    if (!mem)
+        abort();
+    return mem;
+}
+
 static inline void xmemfree(void **ptr) {
     p_delete(ptr);
 }
 
+static inline void xrealloc(void **ptr, ssize_t newsize) {
+    if (newsize <= 0) {
+        p_delete(ptr);
+    } else {
+        *ptr = realloc(*ptr, newsize);
+        if (!*ptr)
+            abort();
+    }
+}
+
+static inline void *xmemdup(const void *src, ssize_t size) {
+    return memcpy(xmalloc(size), src, size);
+}
+
+static inline void *xmemdupstr(const void *src, ssize_t len) {
+    char *res = memcpy(xmalloc(len + 1), src, len);
+    res[len] = '\0';
+    return res;
+}
+
 #endif /* MUTT_LIB_LIB_MEM_H */