Module Name: src
Committed By: maya
Date: Thu Mar 9 11:39:41 UTC 2017
Modified Files:
src/lib/libc/gen: extattr.c
Log Message:
Remove redundant null check before free. it is safe to free(NULL)
While here, clear up odd whitespace issue. NFC
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/gen/extattr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/extattr.c
diff -u src/lib/libc/gen/extattr.c:1.4 src/lib/libc/gen/extattr.c:1.5
--- src/lib/libc/gen/extattr.c:1.4 Tue Mar 13 21:13:34 2012
+++ src/lib/libc/gen/extattr.c Thu Mar 9 11:39:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: extattr.c,v 1.4 2012/03/13 21:13:34 christos Exp $ */
+/* $NetBSD: extattr.c,v 1.5 2017/03/09 11:39:41 maya Exp $ */
/*-
* Copyright (c) 2001 Robert N. M. Watson
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: extattr.c,v 1.4 2012/03/13 21:13:34 christos Exp $");
+__RCSID("$NetBSD: extattr.c,v 1.5 2017/03/09 11:39:41 maya Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -150,7 +150,7 @@ extattr_copy_fd(int from_fd, int to_fd,
}
if ((vlen = extattr_get_fd(from_fd, namespace, aname,
- aval, (size_t)vlen)) == -1)
+ aval, (size_t)vlen)) == -1)
goto out;
if (extattr_set_fd(to_fd, namespace, aname,
@@ -160,12 +160,9 @@ extattr_copy_fd(int from_fd, int to_fd,
error = 0;
out:
- if (aval != NULL)
- free(aval);
-
- if (alist != NULL)
- free(alist);
-
+ free(aval);
+ free(alist);
+
return error;
}
@@ -222,7 +219,8 @@ extattr_copy_file(const char *from, cons
maxvlen = vlen;
}
- if ((vlen = extattr_get_file(from, namespace, aname, aval, (size_t)vlen)) == -1)
+ if ((vlen = extattr_get_file(from, namespace, aname,
+ aval, (size_t)vlen)) == -1)
goto out;
if (extattr_set_file(to, namespace, aname,
@@ -232,12 +230,9 @@ extattr_copy_file(const char *from, cons
error = 0;
out:
- if (aval != NULL)
- free(aval);
-
- if (alist != NULL)
- free(alist);
-
+ free(aval);
+ free(alist);
+
return error;
}
@@ -305,12 +300,9 @@ extattr_copy_link(const char *from, cons
error = 0;
out:
- if (aval != NULL)
- free(aval);
-
- if (alist != NULL)
- free(alist);
-
+ free(aval);
+ free(alist);
+
return error;
}
