shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

dev-cache: collapsing slashes counts string size

Browse Source 
_collapse_slashes() already goes through the whole string,
so just return now already known string length.
This commit is contained in:
Zdenek Kabelac 2024-05-22 11:17:09 +02:00
parent caa0e08738
commit d8e639ecba
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/device/dev-cache.c
View File

@ -854,8 +854,9 @@ static int _insert_dev(const char *path, dev_t d)
/* /*
* Get rid of extra slashes in the path string. * Get rid of extra slashes in the path string.
*/ */
static void _collapse_slashes(char *str) static size_t _collapse_slashes(char *str)
{ {
char *start = str;
char *ptr; char *ptr;
int was_slash = 0; int was_slash = 0;
@ -870,7 +871,9 @@ static void _collapse_slashes(char *str)
*str++ = *ptr; *str++ = *ptr;
} }
*str = *ptr; *str = 0;
return (str - start);
} }
static int _insert_dir(const char *dir) static int _insert_dir(const char *dir)
@ -884,8 +887,8 @@ static int _insert_dir(const char *dir)
log_debug_devs("Dir path %s is too long", path); log_debug_devs("Dir path %s is too long", path);
return 0; return 0;
} }
_collapse_slashes(path);
len = strlen(path); len = _collapse_slashes(path);
if (len && path[len - 1] != '/') if (len && path[len - 1] != '/')
path[len++] = '/'; path[len++] = '/';