commit d7634dc5196801c5a3e6be9eb2167c2c96f48ab4 Author: teor <teor2345@gmail.com> Date: Wed Nov 2 14:13:34 2016 +1100 Create get_fname_suffix, and refactor get_fname to use it --- src/test/testing_common.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index fd7c4e7..e28e3dd 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -102,18 +102,29 @@ setup_directory(void) temp_dir_setup_in_pid = getpid(); } -/** Return a filename relative to our testing temporary directory */ -const char * -get_fname(const char *name) +/** Return a filename relative to our testing temporary directory, based on + * name and suffix. If name is NULL, return the name of the testing temporary + * directory. */ +static const char * +get_fname_suffix(const char *name, const char *suffix) { static char buf[1024]; setup_directory(); if (!name) return temp_dir; - tor_snprintf(buf,sizeof(buf),"%s/%s",temp_dir,name); + tor_snprintf(buf,sizeof(buf),"%s/%s%s%s",temp_dir,name,suffix ? "_" : "", + suffix ? suffix : ""); return buf; } +/** Return a filename relative to our testing temporary directory. If name is + * NULL, return the name of the testing temporary directory. */ +const char * +get_fname(const char *name) +{ + return get_fname_suffix(name, NULL); +} + /* Remove a directory and all of its subdirectories */ static void rm_rf(const char *dir)