Make to_string virtual, fix some warnings

[cascardo/gnio.git] / gnio / ginet4address.c

diff --git a/gnio/ginet4address.c b/gnio/ginet4address.c
index 7ab6361..12919b1 100644 (file)
--- a/gnio/ginet4address.c
+++ b/gnio/ginet4address.c
@@ -43,6 +43,18 @@ struct _GInet4AddressPrivate {
   } addr;
 };
 
+static gchar *
+g_inet4_address_to_string (GInetAddress *address)
+{
+  guint8 *addr;
+
+  g_return_val_if_fail (G_IS_INET4_ADDRESS (address), NULL);
+
+  addr = G_INET4_ADDRESS (address)->priv->addr.u4_addr8;
+
+  return g_strdup_printf ("%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
+}
+
 static gboolean
 g_inet4_address_is_any (GInetAddress *address)
 {
@@ -156,6 +168,7 @@ g_inet4_address_class_init (GInet4AddressClass *klass)
   gobject_class->finalize = g_inet4_address_finalize;
   gobject_class->dispose = g_inet4_address_dispose;
 
+  ginetaddress_class->to_string = g_inet4_address_to_string;
   ginetaddress_class->is_any = g_inet4_address_is_any;
   ginetaddress_class->is_linklocal = g_inet4_address_is_linklocal;
   ginetaddress_class->is_loopback = g_inet4_address_is_loopback;
@@ -202,18 +215,6 @@ g_inet4_address_from_string (const gchar *string)
   return g_inet4_address_from_bytes ((guint8 *) &(addr.s_addr));
 }
 
-char *
-g_inet4_address_to_string (GInet4Address *address)
-{
-  guint8 *addr;
-
-  g_return_val_if_fail (G_IS_INET4_ADDRESS (address), NULL);
-
-  addr = address->priv->addr.u4_addr8;
-
-  return g_strdup_printf ("%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
-}
-
 GInet4Address *
 g_inet4_address_from_bytes (guint8 bytes[])
 {
@@ -240,7 +241,7 @@ g_inet4_address_to_bytes (GInet4Address *address)
 GInet4Address *
 g_inet4_address_new_loopback (void)
 {
-  guint8 addr[8] = {127, 0, 0, 1};
+  guint8 addr[4] = {127, 0, 0, 1};
 
   return g_inet4_address_from_bytes (addr);
 }
@@ -248,7 +249,7 @@ g_inet4_address_new_loopback (void)
 GInet4Address *
 g_inet4_address_new_any (void)
 {
-  guint8 addr[8] = {0, 0, 0, 0};
+  guint8 addr[4] = {0, 0, 0, 0};
 
   return g_inet4_address_from_bytes (addr);
 }