From 54aeab1962d77455a65d0d4338beaabbb936310f Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 10 Apr 2016 22:43:23 +0300 Subject: [PATCH] lib: clean up _notmuch_database_split_path Make the logic it a bit easier to read. No functional changes. --- lib/database.cc | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index b8486f7d..c8c5e261 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -1761,18 +1761,11 @@ _notmuch_database_split_path (void *ctx, slash = path + strlen (path) - 1; /* First, skip trailing slashes. */ - while (slash != path) { - if (*slash != '/') - break; - + while (slash != path && *slash == '/') --slash; - } /* Then, find a slash. */ - while (slash != path) { - if (*slash == '/') - break; - + while (slash != path && *slash != '/') { if (basename) *basename = slash; @@ -1780,12 +1773,8 @@ _notmuch_database_split_path (void *ctx, } /* Finally, skip multiple slashes. */ - while (slash != path) { - if (*(slash - 1) != '/') - break; - + while (slash != path && *(slash - 1) == '/') --slash; - } if (slash == path) { if (directory) -- 2.26.2