diff options
| author | Tim Kientzle <kientzle@gmail.com> | 2013-12-19 20:10:46 -0800 |
|---|---|---|
| committer | Tim Kientzle <kientzle@gmail.com> | 2013-12-19 20:10:46 -0800 |
| commit | 5c4b026c4ad992badb261268a5d368d245ad80cd (patch) | |
| tree | aaa6b44ae372b4022fcd357d44dcd560c7164b23 /libarchive_fe | |
| parent | b462718b703130234668f42a6a64d744a9947520 (diff) | |
| download | libarchive-5c4b026c4ad992badb261268a5d368d245ad80cd.tar.gz | |
Refactor lafe_setprogname slightly to avoid the repeated logic about default handling
Diffstat (limited to 'libarchive_fe')
| -rw-r--r-- | libarchive_fe/err.c | 6 | ||||
| -rw-r--r-- | libarchive_fe/err.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libarchive_fe/err.c b/libarchive_fe/err.c index 408c2029..8618a94e 100644 --- a/libarchive_fe/err.c +++ b/libarchive_fe/err.c @@ -52,9 +52,11 @@ lafe_getprogname(void) } void -lafe_setprogname(const char *name) +lafe_setprogname(const char *name, const char *defaultname) { - + + if (name == NULL) + name = defaultname; #if defined(_WIN32) && !defined(__CYGWIN__) lafe_progname = strrchr(name, '\\'); if (strrchr(name, '/') > lafe_progname) diff --git a/libarchive_fe/err.h b/libarchive_fe/err.h index c351cba8..ebf5de81 100644 --- a/libarchive_fe/err.h +++ b/libarchive_fe/err.h @@ -45,6 +45,6 @@ void lafe_errc(int eval, int code, const char *fmt, ...) __LA_DEAD __LA_PRINTFLIKE(3, 4); const char * lafe_getprogname(void); -void lafe_setprogname(const char *); +void lafe_setprogname(const char *name, const char *defaultname); #endif |