xattr-util: add missing assertions

Follow-up for ed024abac6e4acad5a77943721e7622bb1b10b71
and 9fbe26cfa8fadb58e048aa6a57ad0dacf5de03fc

Also, let's not get too tangled up in the style of defining variables
in between. The functions are short enough, and vars involved are still
effectively at the beginning... Put differently, the separation from
'int r' is too deliberate and brings no actual value in my eyes.

diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index f958e480ffb0a0fba68c5ef0fef149081d4d74e6..deacc1025a69d7b9e5189cfe96c0d628d442f64d 100644 (file)
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -192,10 +192,11 @@ int getxattr_at_bool(int fd, const char *path, const char *name, int at_flags) {
 }
 
 int getxattr_at_strv(int fd, const char *path, const char *name, int at_flags, char ***ret_strv) {
+        _cleanup_free_ char *nulstr = NULL;
+        size_t nulstr_size;
         int r;
 
-        _cleanup_free_ char *nulstr = NULL;
-        size_t nulstr_size = 0;
+        assert(ret_strv);
 
         r = getxattr_at_malloc(fd, path, name, at_flags, &nulstr, &nulstr_size);
         if (r < 0)
@@ -343,11 +344,13 @@ int xsetxattr_full(
         return 0;
 }
 
-int xsetxattr_strv(int fd, const char *path, int at_flags, const char *name, char * const* l) {
+int xsetxattr_strv(int fd, const char *path, int at_flags, const char *name, char * const *l) {
+        _cleanup_free_ char *nulstr = NULL;
+        size_t size;
         int r;
 
-        _cleanup_free_ char *nulstr = NULL;
-        size_t size = 0;
+        assert(name);
+
         r = strv_make_nulstr(l, &nulstr, &size);
         if (r < 0)
                 return r;

diff --git a/src/basic/xattr-util.h b/src/basic/xattr-util.h
index 02293e50073105009b0727325756fce8001ad778..773e736cfb9dbcf706e39d4bab6bdbeb3394aaa8 100644 (file)
--- a/src/basic/xattr-util.h
+++ b/src/basic/xattr-util.h
@@ -50,7 +50,7 @@ static inline int xsetxattr(
         return xsetxattr_full(fd, path, at_flags, name, value, SIZE_MAX, 0);
 }
 
-int xsetxattr_strv(int fd, const char *path, int at_flags, const char *name, char *const*l);
+int xsetxattr_strv(int fd, const char *path, int at_flags, const char *name, char * const *l);
 
 int xremovexattr(int fd, const char *path, int at_flags, const char *name);