diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-01-27 14:27:10 +1100 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-02-23 09:53:36 +1100 |
| commit | 2d9080fa97d8e7d5d73b3e40127a1abbeb852ca9 (patch) | |
| tree | a998d881b5540ac962680eb46fced14bdd80f001 /telepathy-glib/gnio-util.c | |
| parent | c9e09c7c21670f37fa0169fa12458b103396d447 (diff) | |
| download | telepathy-glib-2d9080fa97d8e7d5d73b3e40127a1abbeb852ca9.tar.gz | |
Cleanup type -> ret_type and type_ -> type
Diffstat (limited to 'telepathy-glib/gnio-util.c')
| -rw-r--r-- | telepathy-glib/gnio-util.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/telepathy-glib/gnio-util.c b/telepathy-glib/gnio-util.c index 40fc966aa..ea8bd62fa 100644 --- a/telepathy-glib/gnio-util.c +++ b/telepathy-glib/gnio-util.c @@ -145,10 +145,10 @@ tp_g_socket_address_from_variant (TpSocketAddressType type, */ GValue * tp_address_variant_from_g_socket_address (GSocketAddress *address, - TpSocketAddressType *type) + TpSocketAddressType *ret_type) { GValue *variant; - TpSocketAddressType type_; + TpSocketAddressType type; g_return_val_if_fail (G_IS_SOCKET_ADDRESS (address), NULL); @@ -163,13 +163,9 @@ tp_address_variant_from_g_socket_address (GSocketAddress *address, gsize len = g_unix_socket_address_get_path_len (unixaddr); if (g_unix_socket_address_get_is_abstract (unixaddr)) - { - type_ = TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX; - } + type = TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX; else - { - type_ = TP_SOCKET_ADDRESS_TYPE_UNIX; - } + type = TP_SOCKET_ADDRESS_TYPE_UNIX; array = g_array_sized_new (TRUE, FALSE, sizeof (char), len); array = g_array_append_vals (array, path, len); @@ -192,12 +188,12 @@ tp_address_variant_from_g_socket_address (GSocketAddress *address, switch (g_inet_address_get_family (addr)) { case G_SOCKET_FAMILY_IPV4: - type_ = TP_SOCKET_ADDRESS_TYPE_IPV4; + type = TP_SOCKET_ADDRESS_TYPE_IPV4; variant = tp_g_value_slice_new (TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4); break; case G_SOCKET_FAMILY_IPV6: - type_ = TP_SOCKET_ADDRESS_TYPE_IPV6; + type = TP_SOCKET_ADDRESS_TYPE_IPV6; variant = tp_g_value_slice_new (TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV6); break; @@ -224,7 +220,8 @@ tp_address_variant_from_g_socket_address (GSocketAddress *address, g_return_val_if_reached (NULL); } - if (type) *type = type_; + if (ret_type != NULL) + *ret_type = type; return variant; } |