[mcs] Accept and ignore command line args supported by csc that we don't

[mono.git] / mono / utils / mono-networkinterfaces.c

diff --git a/mono/utils/mono-networkinterfaces.c b/mono/utils/mono-networkinterfaces.c
index a05ad99a4662a34ca259dd1d3ea971c832aae789..fc5bcc966a7105f964abe575254493d9498aa50b 100644 (file)
--- a/mono/utils/mono-networkinterfaces.c
+++ b/mono/utils/mono-networkinterfaces.c
@@ -46,7 +46,7 @@ mono_networkinterface_list (int *size)
                                count *= 2;
                }
 
-               nilist = g_realloc (nilist, count * sizeof (void*));
+               nilist = (void **) g_realloc (nilist, count * sizeof (void*));
                nilist [i++] = g_strdup (name);
        }
 
@@ -55,6 +55,8 @@ mono_networkinterface_list (int *size)
        if (size)
                *size = i;
 
+       if (!nilist)
+               nilist = (void **) g_malloc (sizeof (void*));
        nilist [i] = NULL;
        return nilist;
 }
@@ -79,8 +81,7 @@ mono_network_get_data (char* name, MonoNetworkData data, MonoNetworkError *error
                rx_fifo, rx_frame, tx_bytes, tx_packets, tx_errs, tx_drops,
                tx_fifo, tx_colls, tx_carrier, rx_multi;
 
-       if (error)
-               *error = MONO_NETWORK_ERROR_OTHER;
+       *error = MONO_NETWORK_ERROR_OTHER;
 
        f = fopen ("/proc/net/dev", "r");
        if (!f) 
@@ -97,7 +98,7 @@ mono_network_get_data (char* name, MonoNetworkData data, MonoNetworkError *error
                char *ptr;
                buf [sizeof (buf) - 1] = 0;
                if ((ptr = strchr (buf, ':')) == NULL ||
-                               (*ptr++ = 0, sscanf (buf, "%s", cname) != 1))
+                               (*ptr++ = 0, sscanf (buf, "%250s", cname) != 1))
                        goto out;
 
                if (strcmp (name, cname) != 0) continue;