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

core: minor code cleanups

Browse Source
This commit is contained in:
Dan Williams
2011-01-24 00:09:55 -06:00
parent 3ee40ddbce
commit d909c4876b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mm-modem-base.c
View File

@@ -164,9 +164,8 @@ gboolean
mm_modem_base_remove_port (MMModemBase *self, MMPort *port) mm_modem_base_remove_port (MMModemBase *self, MMPort *port)
{ {
MMModemBasePrivate *priv; MMModemBasePrivate *priv;
char *device, *key, *dupname; char *device, *key, *name;
const char *type_name, *name; const char *type_name, *subsys;
MMPortSubsys subsys;
gboolean removed; gboolean removed;
g_return_val_if_fail (MM_IS_MODEM_BASE (self), FALSE); g_return_val_if_fail (MM_IS_MODEM_BASE (self), FALSE);
@@ -174,21 +173,20 @@ mm_modem_base_remove_port (MMModemBase *self, MMPort *port)
priv = MM_MODEM_BASE_GET_PRIVATE (self); priv = MM_MODEM_BASE_GET_PRIVATE (self);
name = mm_port_get_device (port); name = g_strdup (mm_port_get_device (port));
dupname = g_strdup (name); subsys = mm_port_subsys_to_name (mm_port_get_subsys (port));
subsys = mm_port_get_subsys (port);
type_name = mm_port_type_to_name (mm_port_get_port_type (port)); type_name = mm_port_type_to_name (mm_port_get_port_type (port));
key = get_hash_key (mm_port_subsys_to_name (subsys), name); key = get_hash_key (subsys, name);
removed = g_hash_table_remove (priv->ports, key); removed = g_hash_table_remove (priv->ports, key);
if (removed) { if (removed) {
/* Port may have already been destroyed by removal from the hash */ /* Port may have already been destroyed by removal from the hash */
device = mm_modem_get_device (MM_MODEM (self)); device = mm_modem_get_device (MM_MODEM (self));
mm_dbg ("(%s) type %s removed from %s", dupname, type_name, device); mm_dbg ("(%s) type %s removed from %s", name, type_name, device);
g_free (device); g_free (device);
} }
g_free (key); g_free (key);
g_free (dupname); g_free (name);
return removed; return removed;
} }