directory: directory_get_path(NULL) is not allowed

Also convert directory_get_path() to an inline function, which returns a constant string.

directory: directory_get_path(NULL) is not allowed
3b6efa99 · Max Kellermann · 68977af6 · 3b6efa99
Commit 3b6efa99 authored Oct 08, 2008 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

directory.h src/directory.h +8 -2

No files found.
--- a/src/directory.h
+++ b/src/directory.h
@@ -70,6 +70,14 @@ directory_is_empty(struct directory *directory)
 	return directory->children.nr == 0 && directory->songs.nr == 0;
 }

+static inline const char *
+directory_get_path(struct directory *directory)
+{
+	if (directory->path == NULL)
+		return "";
+	return directory->path;
+}
+
 void
 directory_prune_empty(struct directory *directory);

@@ -94,6 +102,4 @@ directory_walk(struct directory *directory,
 	       int (*forEachDir)(struct directory *, void *),
 	       void *data);

-#define directory_get_path(dir) ((dir && dir->path) ? dir->path : "")
-
 #endif