mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-10 11:40:18 +01:00
Warning cleanups
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3118 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
89a39c7328
commit
084196ff43
4 changed files with 7 additions and 8 deletions
|
|
@ -243,8 +243,6 @@ nm_device_802_3_ethernet_new (const char *udi,
|
|||
const char *iface,
|
||||
const char *driver)
|
||||
{
|
||||
GObject *obj;
|
||||
|
||||
g_return_val_if_fail (udi != NULL, NULL);
|
||||
g_return_val_if_fail (iface != NULL, NULL);
|
||||
g_return_val_if_fail (driver != NULL, NULL);
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ is_modem_device (NMHalManager *manager, const char *udi)
|
|||
return is_modem;
|
||||
}
|
||||
|
||||
NMDevice *
|
||||
static NMDevice *
|
||||
modem_device_creator (NMHalManager *manager, const char *udi)
|
||||
{
|
||||
char *serial_device;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
||||
|
||||
#define _GNU_SOURCE /* for strcasestr() */
|
||||
|
||||
#include <termio.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -508,7 +510,7 @@ wait_for_reply_got_data (GIOChannel *source,
|
|||
char buf[4096];
|
||||
GIOStatus status;
|
||||
gboolean done = FALSE;
|
||||
int index = -1;
|
||||
int idx = -1;
|
||||
int i;
|
||||
|
||||
if (condition & G_IO_IN) {
|
||||
|
|
@ -531,7 +533,7 @@ wait_for_reply_got_data (GIOChannel *source,
|
|||
|
||||
for (i = 0; info->str_needles[i]; i++) {
|
||||
if (strcasestr (buf, info->str_needles[i])) {
|
||||
index = i;
|
||||
idx = i;
|
||||
done = TRUE;
|
||||
}
|
||||
}
|
||||
|
|
@ -543,7 +545,7 @@ wait_for_reply_got_data (GIOChannel *source,
|
|||
done = TRUE;
|
||||
|
||||
if (done) {
|
||||
info->callback (info->device, index, info->user_data);
|
||||
info->callback (info->device, idx, info->user_data);
|
||||
|
||||
/* Clear the id - returning FALSE already removes it */
|
||||
info->got_data_id = 0;
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ get_network_done (NMSerialDevice *device,
|
|||
static void
|
||||
automatic_registration_get_network (NMSerialDevice *device)
|
||||
{
|
||||
char terminators[] = { '\r', '\n', NULL };
|
||||
char terminators[] = { '\r', '\n', '\0' };
|
||||
|
||||
nm_serial_device_send_command_string (device, "AT+COPS?");
|
||||
nm_serial_device_get_reply (device, 10, terminators, get_network_done, NULL);
|
||||
|
|
@ -355,7 +355,6 @@ nm_umts_device_init (NMUmtsDevice *self)
|
|||
static void
|
||||
nm_umts_device_class_init (NMUmtsDeviceClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
|
||||
|
||||
device_class->get_generic_capabilities = real_get_generic_capabilities;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue