chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic/strv: allow NULLs to be inserted into strv
[elogind.git]
/
src
/
basic
/
strv.c
diff --git
a/src/basic/strv.c
b/src/basic/strv.c
index c98e956fd92ce7be1cfa5a8e55e0276f77f59163..4d3cce8260c3d78272f983fc9d61a2fc0c0af03d 100644
(file)
--- a/
src/basic/strv.c
+++ b/
src/basic/strv.c
@@
-572,9
+572,6
@@
int strv_extend_front(char ***l, const char *value) {
/* Like strv_extend(), but prepends rather than appends the new entry */
/* Like strv_extend(), but prepends rather than appends the new entry */
- if (!value)
- return 0;
-
n = strv_length(*l);
/* Increase and overflow check. */
n = strv_length(*l);
/* Increase and overflow check. */
@@
-582,9
+579,12
@@
int strv_extend_front(char ***l, const char *value) {
if (m < n)
return -ENOMEM;
if (m < n)
return -ENOMEM;
- v = strdup(value);
- if (!v)
- return -ENOMEM;
+ if (value) {
+ v = strdup(value);
+ if (!v)
+ return -ENOMEM;
+ } else
+ v = NULL;
c = realloc_multiply(*l, sizeof(char*), m);
if (!c) {
c = realloc_multiply(*l, sizeof(char*), m);
if (!c) {