summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-07-31 19:56:38 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2015-07-31 19:56:38 +0200
commit97b11eedff9d2e17101ad453caf9e48b73246719 (patch)
treeadd86c36a039f2cbeb8232908c7a0cb3ca784ea5 /src/basic
parentb2a0ac5e5b29c73ca7c0da23369a4769d5a91ddd (diff)
tree-wide: introduce mfree()
Pretty trivial helper which wraps free() but returns NULL, so we can simplify this: free(foobar); foobar = NULL; to this: foobar = mfree(foobar);
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/copy.c6
-rw-r--r--src/basic/util.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/src/basic/copy.c b/src/basic/copy.c
index e2d356d676..33427c6a73 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -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;
}
diff --git a/src/basic/util.h b/src/basic/util.h
index c2e5cc610b..06c82665be 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -84,6 +84,11 @@ bool streq_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";
}