From 1946bc567f05a9091e4bd745605d63e367f677c8 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Tue, 21 Jun 2005 20:41:52 +0000 Subject: [PATCH] 2005-06-21 Robert Love * src/backends/NetworkManagerSuSE.c: cleanup. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@734 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 3 ++- src/backends/NetworkManagerSuSE.c | 17 ++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8a45d94b..892cabb94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2005-06-21 Robert Love - * initscript/SUSE/networkmanager: update + * initscript/SUSE/networkmanager: update. + * src/backends/NetworkManagerSuSE.c: cleanup. 2005-06-21 Robert Love diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index a39241e3f..1146f1364 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -1,7 +1,9 @@ -/* NetworkManager -- Network link manager +/* + * NetworkManager -- Network link manager * * Dan Williams * Kay Sievers + * Robert Love * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +28,7 @@ #include #include #include + #include "NetworkManagerSystem.h" #include "NetworkManagerUtils.h" #include "NetworkManagerDevice.h" @@ -317,7 +320,6 @@ void nm_system_restart_mdns_responder (void) void nm_system_device_add_ip6_link_address (NMDevice *dev) { char *buf; - char *addr; struct ether_addr hw_addr; unsigned char eui[8]; @@ -438,7 +440,8 @@ void *nm_system_device_get_system_config (NMDevice *dev) FILE *f = NULL; char buffer[512]; gboolean error = FALSE; - int i, len; + unsigned int i; + int len; struct in_addr temp_addr; char *ip_str; @@ -519,12 +522,12 @@ found: } else { - guint32 addr = nm_ip4_config_get_address (sys_data->config); + guint32 ip4addr = nm_ip4_config_get_address (sys_data->config); /* Make a default netmask if we have an IP address */ - if (((ntohl (addr) & 0xFF000000) >> 24) <= 127) + if (((ntohl (ip4addr) & 0xFF000000) >> 24) <= 127) nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000)); - else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191) + else if (((ntohl (ip4addr) & 0xFF000000) >> 24) <= 191) nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000)); else nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00)); @@ -602,7 +605,7 @@ out: len = nm_ip4_config_get_num_nameservers (sys_data->config); for (i = 0; i < len; i++) { - guint ns_addr = nm_ip4_config_get_nameserver (sys_data->config, i); + guint ns_addr = nm_ip4_config_get_nameserver (sys_data->config, i); temp_addr.s_addr = ns_addr; ip_str = g_strdup (inet_ntoa (temp_addr));