diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-04-19 19:02:16 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-04-19 19:02:16 +0200 |
commit | 6773d000e381651f00c8ffad74cf96e6d0647da9 (patch) | |
tree | 769dfbce402e1e350b0880e8ee57fb848ade39c0 | |
parent | b03a650160def727ff6547cdc35351d76dceecfd (diff) |
util: if NULL is passed to pa_path_get_filename() just hand it through
-rw-r--r-- | src/pulse/util.c | 3 | ||||
-rw-r--r-- | src/pulse/util.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/pulse/util.c b/src/pulse/util.c index 54a188d5..6f1e40a9 100644 --- a/src/pulse/util.c +++ b/src/pulse/util.c @@ -219,7 +219,8 @@ char *pa_get_binary_name(char *s, size_t l) { char *pa_path_get_filename(const char *p) { char *fn; - pa_assert(p); + if (!p) + return NULL; if ((fn = strrchr(p, PA_PATH_SEP_CHAR))) return fn+1; diff --git a/src/pulse/util.h b/src/pulse/util.h index f6dd40cb..ad85653d 100644 --- a/src/pulse/util.h +++ b/src/pulse/util.h @@ -51,7 +51,7 @@ char *pa_get_home_dir(char *s, size_t l); char *pa_get_binary_name(char *s, size_t l); /** Return a pointer to the filename inside a path (which is the last - * component). */ + * component). If passed NULL will return NULL. */ char *pa_path_get_filename(const char *p); /** Wait t milliseconds */ |