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

2005-02-02 Dan Williams <dcbw@redhat.com>

Browse Source 
* Clean up unused variables and the like


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@408 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-02-02 21:57:29 +00:00
parent a03d8042c3
commit 9a46c8dbed
6 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2005-02-02 Dan Williams <dcbw@redhat.com>
* Clean up unused variables and the like
2005-02-02 Dan Williams <dcbw@redhat.com> 2005-02-02 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAPList.c * src/NetworkManagerAPList.c

3
info-daemon/NetworkManagerInfoDbus.c
View File

@@ -742,9 +742,6 @@ gboolean shutdown_callback (gpointer data)
static DBusHandlerResult nmi_dbus_filter (DBusConnection *connection, DBusMessage *message, void *user_data) static DBusHandlerResult nmi_dbus_filter (DBusConnection *connection, DBusMessage *message, void *user_data)
{ {
char *ap_path;
char *dev_path;
DBusError error;
gboolean handled = FALSE; gboolean handled = FALSE;
NMIAppInfo *info = (NMIAppInfo *) user_data; NMIAppInfo *info = (NMIAppInfo *) user_data;
gboolean appeared = FALSE; gboolean appeared = FALSE;

1
src/NetworkManager.c
View File

@@ -512,7 +512,6 @@ static NMData *nm_data_new (gboolean enable_test_devices)
sigset_t block_mask; sigset_t block_mask;
NMData *data; NMData *data;
GSource *iosource; GSource *iosource;
GError *error = NULL;
data = g_new0 (NMData, 1); data = g_new0 (NMData, 1);

10
src/NetworkManagerDevice.c
View File

@@ -1090,7 +1090,6 @@ int nm_device_get_bitrate (NMDevice *dev)
void nm_device_set_bitrate (NMDevice *dev, const int Mbps) void nm_device_set_bitrate (NMDevice *dev, const int Mbps)
{ {
int sk; int sk;
int err;
g_return_if_fail (dev != NULL); g_return_if_fail (dev != NULL);
g_return_if_fail (nm_device_is_wireless (dev)); g_return_if_fail (nm_device_is_wireless (dev));
@@ -1651,7 +1650,6 @@ gboolean nm_device_set_mode (NMDevice *dev, const NMNetworkMode mode)
void nm_device_activation_schedule_finish (NMDevice *dev, DeviceStatus activation_result) void nm_device_activation_schedule_finish (NMDevice *dev, DeviceStatus activation_result)
{ {
GSource *source = NULL; GSource *source = NULL;
guint source_id = 0;
NMActivationResult *result = NULL; NMActivationResult *result = NULL;
g_return_if_fail (dev != NULL); g_return_if_fail (dev != NULL);
@@ -1680,10 +1678,8 @@ void nm_device_activation_schedule_finish (NMDevice *dev, DeviceStatus activatio
*/ */
gboolean nm_device_activation_schedule_start (NMDevice *dev) gboolean nm_device_activation_schedule_start (NMDevice *dev)
{ {
GError *error = NULL;
NMData *data = NULL; NMData *data = NULL;
GSource *source = NULL; GSource *source = NULL;
guint source_id = 0;
g_return_val_if_fail (dev != NULL, FALSE); g_return_val_if_fail (dev != NULL, FALSE);
g_return_val_if_fail (!dev->activating, TRUE); /* Return if activation has already begun */ g_return_val_if_fail (!dev->activating, TRUE); /* Return if activation has already begun */
@@ -1818,7 +1814,6 @@ static gboolean nm_device_wireless_wait_for_link (NMDevice *dev, const char *ess
static gboolean nm_device_set_wireless_config (NMDevice *dev, NMAccessPoint *ap) static gboolean nm_device_set_wireless_config (NMDevice *dev, NMAccessPoint *ap)
{ {
NMDeviceAuthMethod auth; NMDeviceAuthMethod auth;
gboolean success = FALSE;
const char *essid = NULL; const char *essid = NULL;
g_return_val_if_fail (dev != NULL, FALSE); g_return_val_if_fail (dev != NULL, FALSE);
@@ -2191,7 +2186,6 @@ try_connect:
while (success == FALSE) while (success == FALSE)
{ {
int ip_success = FALSE;
NMAccessPoint *tmp_ap = NULL; NMAccessPoint *tmp_ap = NULL;
gboolean link = FALSE; gboolean link = FALSE;
gboolean adhoc = (nm_ap_get_mode (best_ap) == NETWORK_MODE_ADHOC); gboolean adhoc = (nm_ap_get_mode (best_ap) == NETWORK_MODE_ADHOC);
@@ -2364,7 +2358,6 @@ static gboolean nm_device_activate (gpointer user_data)
NMDevice *dev = (NMDevice *)user_data; NMDevice *dev = (NMDevice *)user_data;
gboolean success = FALSE; gboolean success = FALSE;
gboolean finished = FALSE; gboolean finished = FALSE;
GMainContext *context = NULL;
g_return_val_if_fail (dev != NULL, FALSE); g_return_val_if_fail (dev != NULL, FALSE);
g_return_val_if_fail (dev->app_data != NULL, FALSE); g_return_val_if_fail (dev->app_data != NULL, FALSE);
@@ -2941,8 +2934,6 @@ static gboolean nm_device_wireless_force_use (NMDevice *dev, const char *essid,
gboolean encrypted = FALSE; gboolean encrypted = FALSE;
NMAccessPoint *ap = NULL; NMAccessPoint *ap = NULL;
NMAccessPoint *tmp_ap = NULL; NMAccessPoint *tmp_ap = NULL;
gboolean success = FALSE;
gboolean exists = FALSE;
g_return_val_if_fail (dev != NULL, FALSE); g_return_val_if_fail (dev != NULL, FALSE);
g_return_val_if_fail (dev->app_data != NULL, FALSE); g_return_val_if_fail (dev->app_data != NULL, FALSE);
@@ -3442,7 +3433,6 @@ static gboolean nm_device_wireless_scan (gpointer user_data)
if ((sk = iw_sockets_open ()) >= 0) if ((sk = iw_sockets_open ()) >= 0)
{ {
wireless_scan *tmp_ap;
int err; int err;
NMNetworkMode orig_mode = NETWORK_MODE_INFRA; NMNetworkMode orig_mode = NETWORK_MODE_INFRA;
double orig_freq = 0; double orig_freq = 0;

1
src/NetworkManagerUtils.c
View File

@@ -44,7 +44,6 @@ GSList *mutex_descs = NULL;
static MutexDesc *nm_find_mutex_desc (GMutex *mutex) static MutexDesc *nm_find_mutex_desc (GMutex *mutex)
{ {
GSList *elt; GSList *elt;
gboolean found = FALSE;
for (elt = mutex_descs; elt; elt = g_slist_next (elt)) for (elt = mutex_descs; elt; elt = g_slist_next (elt))
{ {

2
src/autoip.c
View File

@@ -172,11 +172,9 @@ gboolean get_autoip (NMDevice *dev, struct in_addr *out_ip)
{ {
struct sockaddr saddr; struct sockaddr saddr;
arpMessage p; arpMessage p;
struct ifreq ifr;
struct ether_addr addr; struct ether_addr addr;
struct in_addr ip = {0}; struct in_addr ip = {0};
int fd; int fd;
int timeout = 0;
int nprobes = 0; int nprobes = 0;
int nannounce = 0; int nannounce = 0;
gboolean success = FALSE; gboolean success = FALSE;