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

coding style

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1187 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2005-12-14 16:23:15 +00:00
parent 08145bc78d
commit 9841fc9c45
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/dhcp-manager/nm-dhcp-manager.c
View File

@@ -480,7 +480,7 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
char * nis_domain = NULL; char * nis_domain = NULL;
guint32 * ip4_nis_servers = NULL; guint32 * ip4_nis_servers = NULL;
struct in_addr temp_addr; struct in_addr temp_addr;
nm_completion_args args; nm_completion_args args;
g_return_val_if_fail (manager != NULL, NULL); g_return_val_if_fail (manager != NULL, NULL);
g_return_val_if_fail (req != NULL, NULL); g_return_val_if_fail (req != NULL, NULL);
@@ -560,8 +560,9 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
g_strfreev (searches); g_strfreev (searches);
} }
if (nis_domain) { if (nis_domain)
nm_ip4_config_set_nis_domain( ip4_config, nis_domain); {
nm_ip4_config_set_nis_domain (ip4_config, nis_domain);
nm_info (" nis domain '%s'", nis_domain); nm_info (" nis domain '%s'", nis_domain);
} }

8
src/nm-ip4-config.c
View File

@@ -42,8 +42,8 @@ struct NMIP4Config
GSList * nameservers; GSList * nameservers;
GSList * domains; GSList * domains;
gchar * nis_domain; gchar * nis_domain;
GSList * nis_servers; GSList * nis_servers;
/* If this is a VPN/etc config that requires /* If this is a VPN/etc config that requires
* another device (like Ethernet) to already have * another device (like Ethernet) to already have
@@ -77,7 +77,7 @@ NMIP4Config *nm_ip4_config_copy (NMIP4Config *src_config)
dst_config->ip4_netmask = nm_ip4_config_get_netmask (src_config); dst_config->ip4_netmask = nm_ip4_config_get_netmask (src_config);
dst_config->ip4_broadcast = nm_ip4_config_get_broadcast (src_config); dst_config->ip4_broadcast = nm_ip4_config_get_broadcast (src_config);
dst_config->nis_domain = g_strdup(nm_ip4_config_get_nis_domain(src_config)); dst_config->nis_domain = g_strdup (nm_ip4_config_get_nis_domain (src_config));
len = nm_ip4_config_get_num_nameservers (src_config); len = nm_ip4_config_get_num_nameservers (src_config);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
@@ -260,7 +260,7 @@ void nm_ip4_config_set_nis_domain (NMIP4Config *config, const char *domain)
if (!strlen (domain)) if (!strlen (domain))
return; return;
config->nis_domain = g_strdup(domain); config->nis_domain = g_strdup (domain);
} }
gchar *nm_ip4_config_get_nis_domain (NMIP4Config *config) gchar *nm_ip4_config_get_nis_domain (NMIP4Config *config)