Merge pull request #814 from dvdhrm/mfree

tree-wide: introduce mfree()
2015-07-31 20:17:33 +02:00
parent 97d09a6283 97b11eedff
commit 6f7897f9d2
25 changed files with 64 additions and 119 deletions
@@ -467,8 +467,7 @@ int copy_xattr(int fdf, int fdt) {

                sza *= 2;

-                free(bufa);
-                bufa = NULL;
+                bufa = mfree(bufa);
        }

        p = bufa;
@@ -491,8 +490,7 @@ int copy_xattr(int fdf, int fdt) {
                        if (m < 0) {
                                if (errno == ERANGE) {
                                        szb *= 2;
-                                        free(bufb);
-                                        bufb = NULL;
+                                        bufb = mfree(bufb);
                                        continue;
                                }

@@ -85,6 +85,11 @@ int strcmp_ptr(const char *a, const char *b) _pure_;

 #define malloc0(n) (calloc((n), 1))

+static inline void *mfree(void *memory) {
+        free(memory);
+        return NULL;
+}
+
 static inline const char* yes_no(bool b) {
        return b ? "yes" : "no";
 }