colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns: move local variables to inner scope in update_resolv_conf()

Browse Source
This commit is contained in:
Thomas Haller
2018-06-01 08:26:29 +02:00
parent 960632ee7b
commit 5485dbea21
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dns/nm-dns-manager.c
View File

@@ -768,8 +768,6 @@ update_resolv_conf (NMDnsManager *self,
gs_free char *content = NULL; gs_free char *content = NULL;
SpawnResult write_file_result = SR_SUCCESS; SpawnResult write_file_result = SR_SUCCESS;
int errsv; int errsv;
const char *rc_path = _PATH_RESCONF;
nm_auto_free char *rc_path_real = NULL;
gboolean resconf_link_cached = FALSE; gboolean resconf_link_cached = FALSE;
gs_free char *resconf_link = NULL; gs_free char *resconf_link = NULL;
@@ -794,6 +792,8 @@ update_resolv_conf (NMDnsManager *self,
if ( rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE if ( rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE
|| ( rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK || ( rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
&& !_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link))) { && !_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link))) {
nm_auto_free char *rc_path_real = NULL;
const char *rc_path = _PATH_RESCONF;
GError *local = NULL; GError *local = NULL;
if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) { if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) {