From cec4a87539599e7d253b694c2a0a81de86d6eb7e Mon Sep 17 00:00:00 2001 From: Yuri Volchkov Date: Mon, 21 Aug 2017 17:44:45 +0200 Subject: [PATCH] database: move striping of trailing '/' into helper function Stripping trailing character is not that uncommon operation. Particularly, the next patch has to perform it as well. Lets move it to the separate function to avoid code duplication. Also the new function has a little improvement: if the character to strip is repeated several times in the end of a string, function strips them all. Signed-off-by: Yuri Volchkov --- lib/database.cc | 3 +-- util/string-util.c | 13 +++++++++++++ util/string-util.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 8f0e22a8..79eb3d69 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -858,8 +858,7 @@ notmuch_database_open_verbose (const char *path, notmuch->status_string = NULL; notmuch->path = talloc_strdup (notmuch, path); - if (notmuch->path[strlen (notmuch->path) - 1] == '/') - notmuch->path[strlen (notmuch->path) - 1] = '\0'; + strip_trailing(notmuch->path, '/'); notmuch->mode = mode; notmuch->atomic_nesting = 0; diff --git a/util/string-util.c b/util/string-util.c index 18125309..b0108811 100644 --- a/util/string-util.c +++ b/util/string-util.c @@ -255,3 +255,16 @@ strcase_hash (const void *ptr) return hash; } + +void +strip_trailing (char *str, char ch) +{ + int i; + + for (i = strlen (str) - 1; i >= 0; i--) { + if (str[i] == ch) + str[i] = '\0'; + else + break; + } +} diff --git a/util/string-util.h b/util/string-util.h index 87917b8f..97770614 100644 --- a/util/string-util.h +++ b/util/string-util.h @@ -75,6 +75,8 @@ int strcase_equal (const void *a, const void *b); /* GLib GHashFunc compatible case insensitive hash function */ unsigned int strcase_hash (const void *ptr); +void strip_trailing (char *str, char ch); + #ifdef __cplusplus } #endif