SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strv: Add _cleanup_strv_free_erase_ and _cleanup_string_free_erase_

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-10-19 23:13:07 +02:00
committed by Lennart Poettering
parent 1602b00853
commit ab84f5b95e
9 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/ask-password-api.c
+1 -2
View File
@@ -94,7 +94,7 @@ static int retrieve_key(key_serial_t serial, char ***ret) {
}
static int add_to_keyring(const char *keyname, AskPasswordFlags flags, char **passwords) {
_cleanup_strv_free_ char **l = NULL;
_cleanup_strv_free_erase_ char **l = NULL;
_cleanup_free_ char *p = NULL;
key_serial_t serial;
size_t n;
@@ -119,7 +119,6 @@ static int add_to_keyring(const char *keyname, AskPasswordFlags flags, char **pa
return r;
r = strv_make_nulstr(l, &p, &n);
strv_erase(l);
if (r < 0)
return r;