summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-11-06 20:18:29 +0100
committerMarcel Holtmann <marcel@holtmann.org>2010-11-06 20:18:29 +0100
commit7739bbaee2eb71ccd7ff4a4799a18dc130069eaf (patch)
tree85c8395663a174061c9bb3e54f8737ea8884a261
parentb82e58f259baa6e29978cef56cb3e1fad1e4d34c (diff)
downloadconnman-7739bbaee2eb71ccd7ff4a4799a18dc130069eaf.tar.gz
connman-7739bbaee2eb71ccd7ff4a4799a18dc130069eaf.tar.bz2
connman-7739bbaee2eb71ccd7ff4a4799a18dc130069eaf.zip
Remove unused device->control value
-rw-r--r--include/device.h2
-rw-r--r--src/device.c8
-rw-r--r--src/inet.c5
3 files changed, 4 insertions, 11 deletions
diff --git a/include/device.h b/include/device.h
index f8bd84e7..31aa92b8 100644
--- a/include/device.h
+++ b/include/device.h
@@ -61,7 +61,7 @@ enum connman_device_type connman_device_get_type(struct connman_device *device);
void connman_device_set_index(struct connman_device *device, int index);
int connman_device_get_index(struct connman_device *device);
void connman_device_set_interface(struct connman_device *device,
- const char *interface, const char *control);
+ const char *interface);
void connman_device_set_ident(struct connman_device *device,
const char *ident);
diff --git a/src/device.c b/src/device.c
index 29129177..aa1ced68 100644
--- a/src/device.c
+++ b/src/device.c
@@ -44,7 +44,6 @@ struct connman_device {
char *node;
char *address;
char *interface;
- char *control;
char *ident;
int phyindex;
unsigned int connections;
@@ -409,7 +408,6 @@ static void device_destruct(struct connman_element *element)
g_free(device->node);
g_free(device->name);
g_free(device->address);
- g_free(device->control);
g_free(device->interface);
g_free(device->last_network);
@@ -575,12 +573,11 @@ void __connman_device_set_phyindex(struct connman_device *device,
* connman_device_set_interface:
* @device: device structure
* @interface: interface name
- * @control: control interface
*
* Set interface name of device
*/
void connman_device_set_interface(struct connman_device *device,
- const char *interface, const char *control)
+ const char *interface)
{
g_free(device->element.devname);
device->element.devname = g_strdup(interface);
@@ -588,9 +585,6 @@ void connman_device_set_interface(struct connman_device *device,
g_free(device->interface);
device->interface = g_strdup(interface);
- g_free(device->control);
- device->control = g_strdup(control);
-
if (device->name == NULL) {
const char *str = type2description(device->type);
if (str != NULL && device->interface != NULL)
diff --git a/src/inet.c b/src/inet.c
index fde95923..f6b80199 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -447,7 +447,7 @@ struct connman_device *connman_inet_create_device(int index)
enum connman_device_type type;
struct connman_device *device;
char *devname, *ident = NULL;
- char *addr = NULL, *name = NULL, *node = NULL;
+ char *addr = NULL, *name = NULL;
if (index < 0)
return NULL;
@@ -506,7 +506,7 @@ struct connman_device *connman_inet_create_device(int index)
}
connman_device_set_index(device, index);
- connman_device_set_interface(device, devname, node);
+ connman_device_set_interface(device, devname);
if (ident != NULL) {
connman_device_set_ident(device, ident);
@@ -517,7 +517,6 @@ struct connman_device *connman_inet_create_device(int index)
done:
g_free(devname);
- g_free(node);
free(name);
free(addr);