diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-27 16:55:16 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-27 16:55:16 +0100 |
| commit | 0d0696812980d8f41c54739ad73716a233a2fa7c (patch) | |
| tree | 217d98308a3039e106efde5fd6a7b6a657916950 /src/resolve/resolved-conf.c | |
| parent | f47fc3ffc4b69a00083a76308f777b52afb8efbf (diff) | |
| parent | 7760171904ef007f19e8f46aa240a00e382d5b74 (diff) | |
Merge pull request #1691 from poettering/util-lib-3
split up util.h and macro.h into even more bits
Diffstat (limited to 'src/resolve/resolved-conf.c')
| -rw-r--r-- | src/resolve/resolved-conf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c index 22a5c7fdbf..c9919ced67 100644 --- a/src/resolve/resolved-conf.c +++ b/src/resolve/resolved-conf.c @@ -19,10 +19,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "alloc-util.h" #include "conf-parser.h" -#include "string-util.h" -#include "resolved-conf.h" #include "extract-word.h" +#include "parse-util.h" +#include "resolved-conf.h" +#include "string-util.h" int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string) { DnsServer *first; @@ -34,7 +36,7 @@ int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string) first = type == DNS_SERVER_FALLBACK ? m->fallback_dns_servers : m->dns_servers; for(;;) { - _cleanup_free_ char *word; + _cleanup_free_ char *word = NULL; union in_addr_union addr; bool found = false; DnsServer *s; @@ -43,7 +45,6 @@ int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string) r = extract_first_word(&string, &word, NULL, 0); if (r < 0) return log_error_errno(r, "Failed to parse resolved dns server syntax \"%s\": %m", string); - if (r == 0) break; |