chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6073be
)
Revert "basic/strv: allow NULLs to be inserted into strv"
author
Lennart Poettering
<lennart@poettering.net>
Tue, 21 Feb 2017 17:11:12 +0000
(18:11 +0100)
committer
Sven Eden
<yamakuzure@gmx.net>
Mon, 17 Jul 2017 15:58:36 +0000
(17:58 +0200)
This reverts commit
18f71a3c8174774c5386c4aba94d54f3b5c36a84
.
According to @keszybz we don't need this anymore, hence drop it:
https://github.com/elogind/elogind/pull/5131/commits/
18f71a3c8174774c5386c4aba94d54f3b5c36a84
#r102232368
src/basic/strv.c
patch
|
blob
|
history
diff --git
a/src/basic/strv.c
b/src/basic/strv.c
index 4d3cce8260c3d78272f983fc9d61a2fc0c0af03d..c98e956fd92ce7be1cfa5a8e55e0276f77f59163 100644
(file)
--- a/
src/basic/strv.c
+++ b/
src/basic/strv.c
@@
-572,6
+572,9
@@
int strv_extend_front(char ***l, const char *value) {
/* Like strv_extend(), but prepends rather than appends the new entry */
+ if (!value)
+ return 0;
+
n = strv_length(*l);
/* Increase and overflow check. */
@@
-579,12
+582,9
@@
int strv_extend_front(char ***l, const char *value) {
if (m < n)
return -ENOMEM;
- if (value) {
- v = strdup(value);
- if (!v)
- return -ENOMEM;
- } else
- v = NULL;
+ v = strdup(value);
+ if (!v)
+ return -ENOMEM;
c = realloc_multiply(*l, sizeof(char*), m);
if (!c) {