picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

strxcpyx: minor coding style updates

This commit is contained in:
Lennart Poettering 2018-10-15 13:57:07 +02:00
parent 057e85805c
commit 686192048a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/basic/strxcpyx.c
View File

@ -31,12 +31,11 @@ size_t strpcpy(char **dest, size_t size, const char *src) {
if (size > 1) if (size > 1)
*dest = mempcpy(*dest, src, size-1); *dest = mempcpy(*dest, src, size-1);
size = 0; size = 0;
} else { } else if (len > 0) {
if (len > 0) { *dest = mempcpy(*dest, src, len);
*dest = mempcpy(*dest, src, len); size -= len;
size -= len;
}
} }
*dest[0] = '\0'; *dest[0] = '\0';
return size; return size;
} }
@ -56,9 +55,8 @@ size_t strpcpyf(char **dest, size_t size, const char *src, ...) {
if (i < (int)size) { if (i < (int)size) {
*dest += i; *dest += i;
size -= i; size -= i;
} else { } else
size = 0; size = 0;
}
va_end(va); va_end(va);
return size; return size;
} }
@ -73,7 +71,7 @@ size_t strpcpyl(char **dest, size_t size, const char *src, ...) {
do { do {
size = strpcpy(dest, size, src); size = strpcpy(dest, size, src);
src = va_arg(va, char *); src = va_arg(va, char *);
} while (src != NULL); } while (src);
va_end(va); va_end(va);
return size; return size;
} }
@ -100,7 +98,7 @@ size_t strscpyl(char *dest, size_t size, const char *src, ...) {
do { do {
size = strpcpy(&s, size, src); size = strpcpy(&s, size, src);
src = va_arg(va, char *); src = va_arg(va, char *);
} while (src != NULL); } while (src);
va_end(va); va_end(va);
return size; return size;