diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-05-14 09:39:13 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-05-14 09:39:13 -0700 |
| commit | 142d289db6d64b586437b50db55045a616a3b828 (patch) | |
| tree | ebde5fae939ebd17e76d2d0ef68dfd918144074d | |
| parent | e30298a7c511e04ac517f60cc3690babf0de3ee5 (diff) | |
| download | connman-142d289db6d64b586437b50db55045a616a3b828.tar.gz connman-142d289db6d64b586437b50db55045a616a3b828.tar.bz2 connman-142d289db6d64b586437b50db55045a616a3b828.zip | |
Some GCC are just too stupid
| -rw-r--r-- | src/detect.c | 5 | ||||
| -rw-r--r-- | src/element.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/detect.c b/src/detect.c index 0dce3d3f..9b5abdfa 100644 --- a/src/detect.c +++ b/src/detect.c @@ -175,7 +175,7 @@ static void detect_newlink(unsigned short type, int index, enum connman_device_type devtype = CONNMAN_DEVICE_TYPE_UNKNOWN; enum connman_device_mode mode = CONNMAN_DEVICE_MODE_UNKNOWN; struct connman_device *device; - char *addr, *name, *devname, *ident; + char *addr, *name, *devname, *ident = NULL; DBG("type %d index %d", type, index); @@ -264,7 +264,6 @@ static void detect_newlink(unsigned short type, int index, case CONNMAN_DEVICE_TYPE_NOVATEL: case CONNMAN_DEVICE_TYPE_GPS: mode = CONNMAN_DEVICE_MODE_UNKNOWN; - ident = NULL; break; case CONNMAN_DEVICE_TYPE_ETHERNET: mode = CONNMAN_DEVICE_MODE_TRANSPORT_IP; @@ -277,11 +276,9 @@ static void detect_newlink(unsigned short type, int index, break; case CONNMAN_DEVICE_TYPE_BLUETOOTH: mode = CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE; - ident = NULL; break; case CONNMAN_DEVICE_TYPE_HSO: mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE; - ident = NULL; connman_device_set_policy(device, CONNMAN_DEVICE_POLICY_MANUAL); break; } diff --git a/src/element.c b/src/element.c index 1ae88bb8..712dec6a 100644 --- a/src/element.c +++ b/src/element.c @@ -286,7 +286,7 @@ static struct connman_network *__connman_element_get_network(struct connman_elem struct connman_service *__connman_element_get_service(struct connman_element *element) { - struct connman_service *service; + struct connman_service *service = NULL; struct connman_network *network; struct connman_device *device; enum connman_device_type type; @@ -306,7 +306,7 @@ struct connman_service *__connman_element_get_service(struct connman_element *el case CONNMAN_DEVICE_TYPE_NOZOMI: case CONNMAN_DEVICE_TYPE_HUAWEI: case CONNMAN_DEVICE_TYPE_NOVATEL: - return NULL; + break; case CONNMAN_DEVICE_TYPE_ETHERNET: service = __connman_service_lookup_from_device(device); break; |