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

dns-domain: follow coding style, initialize ret params on success

This commit is contained in:
Lennart Poettering 2020-11-06 20:24:30 +01:00
parent 442bc2afee
commit cb3714d100
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/dns-domain.c
View File

@ -1308,18 +1308,19 @@ int dns_name_apply_idna(const char *name, char **ret) {
if (r != IDN2_OK) { if (r != IDN2_OK) {
log_debug("idn2_to_unicode_8z8z(\"%s\") failed: %d/%s", log_debug("idn2_to_unicode_8z8z(\"%s\") failed: %d/%s",
t, r, sym_idn2_strerror(r)); t, r, sym_idn2_strerror(r));
*ret = NULL;
return 0; return 0;
} }
if (!streq_ptr(name, s)) { if (!streq_ptr(name, s)) {
log_debug("idn2 roundtrip failed: \"%s\" → \"%s\" → \"%s\", ignoring.", log_debug("idn2 roundtrip failed: \"%s\" → \"%s\" → \"%s\", ignoring.",
name, t, s); name, t, s);
*ret = NULL;
return 0; return 0;
} }
} }
*ret = TAKE_PTR(t); *ret = TAKE_PTR(t);
return 1; /* *ret has been written */ return 1; /* *ret has been written */
} }
@ -1329,6 +1330,7 @@ int dns_name_apply_idna(const char *name, char **ret) {
return 0; return 0;
if (IN_SET(r, IDN2_TOO_BIG_DOMAIN, IDN2_TOO_BIG_LABEL)) if (IN_SET(r, IDN2_TOO_BIG_DOMAIN, IDN2_TOO_BIG_LABEL))
return -ENOSPC; return -ENOSPC;
return -EINVAL; return -EINVAL;
#elif HAVE_LIBIDN #elif HAVE_LIBIDN
_cleanup_free_ char *buf = NULL; _cleanup_free_ char *buf = NULL;