basic/fileio: minor coding style cleanup

Follow-up for bbec1c87d3bf8d14eeb1ee3b4df973a53cca2e58

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 52a29e2f7bd2a1381860a158da0f05e186120dc8..2d29c384cc7a61615f0e05fa7cafbdb23e401ef6 100644 (file)
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -322,8 +322,7 @@ int write_string_file_full(
         mode_t mode = write_string_file_flags_to_mode(flags);
 
         if (FLAGS_SET(flags, WRITE_STRING_FILE_LABEL|WRITE_STRING_FILE_CREATE)) {
-                const char *lookup = label_fn ? label_fn : fn;
-                r = label_ops_pre(dir_fd, lookup, mode);
+                r = label_ops_pre(dir_fd, label_fn ?: fn, mode);
                 if (r < 0)
                         goto fail;
 

diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 08017f8270450c3d3eab7333a1563b965adb891f..71ec6ba9210a05f53e948a99c4847ff6ef95b09f 100644 (file)
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -49,15 +49,15 @@ FILE* fmemopen_unlocked(void *buf, size_t size, const char *mode);
 
 int write_string_stream_full(FILE *f, const char *line, WriteStringFileFlags flags, const struct timespec *ts);
 static inline int write_string_stream(FILE *f, const char *line, WriteStringFileFlags flags) {
-        return write_string_stream_full(f, line, flags, /* ts= */ NULL);
+        return write_string_stream_full(f, line, flags, NULL);
 }
 
 int write_string_file_full(int dir_fd, const char *fn, const char *line, WriteStringFileFlags flags, const struct timespec *ts, const char *label_fn);
-static inline int write_string_file(const char *fn, const char *line, WriteStringFileFlags flags) {
-        return write_string_file_full(AT_FDCWD, fn, line, flags, /* ts= */ NULL, /*label_fn=*/ NULL);
-}
 static inline int write_string_file_at(int dir_fd, const char *fn, const char *line, WriteStringFileFlags flags) {
-        return write_string_file_full(dir_fd, fn, line, flags, /* ts= */ NULL, /*label_fn=*/ NULL);
+        return write_string_file_full(dir_fd, fn, line, flags, NULL, NULL);
+}
+static inline int write_string_file(const char *fn, const char *line, WriteStringFileFlags flags) {
+        return write_string_file_at(AT_FDCWD, fn, line, flags);
 }
 int write_string_filef(const char *fn, WriteStringFileFlags flags, const char *format, ...) _printf_(3, 4);