From f89b202b68eaf920e969e155aee2f40f5b063c45 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 1 Jan 2009 19:46:14 +0100 Subject: [PATCH] Don't use default for enum based switch statements --- src/detect.c | 16 +++++++++------- src/device.c | 23 ++++++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/detect.c b/src/detect.c index b82974a..8d64aeb 100644 --- a/src/detect.c +++ b/src/detect.c @@ -177,18 +177,20 @@ static void detect_newlink(unsigned short type, int index, devtype = CONNMAN_DEVICE_TYPE_HSO; } - if (devtype == CONNMAN_DEVICE_TYPE_UNKNOWN) { + switch (devtype) { + case CONNMAN_DEVICE_TYPE_UNKNOWN: g_free(devname); return; - } - - switch (devtype) { + case CONNMAN_DEVICE_TYPE_ETHERNET: + case CONNMAN_DEVICE_TYPE_WIFI: + case CONNMAN_DEVICE_TYPE_WIMAX: + name = index2ident(index, "dev_"); + break; + case CONNMAN_DEVICE_TYPE_BLUETOOTH: case CONNMAN_DEVICE_TYPE_HSO: + case CONNMAN_DEVICE_TYPE_VENDOR: name = strdup(devname); break; - default: - name = index2ident(index, "dev_"); - break; } device = connman_device_create(name, devtype); diff --git a/src/device.c b/src/device.c index 3930d75..ee4d91c 100644 --- a/src/device.c +++ b/src/device.c @@ -90,6 +90,8 @@ static const char *type2string(enum connman_device_type type) static const char *policy2string(enum connman_device_policy policy) { switch (policy) { + case CONNMAN_DEVICE_POLICY_UNKNOWN: + break; case CONNMAN_DEVICE_POLICY_IGNORE: return "ignore"; case CONNMAN_DEVICE_POLICY_OFF: @@ -98,9 +100,9 @@ static const char *policy2string(enum connman_device_policy policy) return "auto"; case CONNMAN_DEVICE_POLICY_MANUAL: return "manual"; - default: - return NULL; } + + return NULL; } static enum connman_device_policy string2policy(const char *policy) @@ -159,6 +161,10 @@ static int set_policy(DBusConnection *connection, return 0; switch (policy) { + case CONNMAN_DEVICE_POLICY_UNKNOWN: + return -EINVAL; + case CONNMAN_DEVICE_POLICY_IGNORE: + break; case CONNMAN_DEVICE_POLICY_OFF: if (device->powered == TRUE) err = set_powered(device, FALSE); @@ -168,8 +174,6 @@ static int set_policy(DBusConnection *connection, if (device->powered == FALSE) err = set_powered(device, TRUE); break; - default: - break; } if (err < 0) @@ -564,12 +568,17 @@ struct connman_device *connman_device_create(const char *node, device->element.index = -1; switch (type) { + case CONNMAN_DEVICE_TYPE_UNKNOWN: + case CONNMAN_DEVICE_TYPE_VENDOR: + case CONNMAN_DEVICE_TYPE_WIFI: + case CONNMAN_DEVICE_TYPE_WIMAX: + case CONNMAN_DEVICE_TYPE_BLUETOOTH: + case CONNMAN_DEVICE_TYPE_HSO: + device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN; + break; case CONNMAN_DEVICE_TYPE_ETHERNET: device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_ETHERNET; break; - default: - device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN; - break; } device->element.device = device; -- 1.7.9.5