From: Daniel Wagner Date: Wed, 19 Dec 2012 14:29:15 +0000 (+0100) Subject: core: Use glib memory functions X-Git-Tag: 1.10~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13d88ea3301c9d333159d9eef486509b6a0836f3;p=platform%2Fupstream%2Fconnman.git core: Use glib memory functions Use for all memory allocation/dealocation operation the glib functions. This allows us to use g_mem_profile(). --- diff --git a/src/device.c b/src/device.c index 072646c..d0c2e7e 100644 --- a/src/device.c +++ b/src/device.c @@ -1167,7 +1167,7 @@ static char *index2ident(int index, const char *prefix) len = prefix ? strlen(prefix) + 18 : 18; - str = malloc(len); + str = g_malloc(len); if (!str) return NULL; @@ -1211,7 +1211,7 @@ static char *index2addr(int index) if (err < 0) return NULL; - str = malloc(18); + str = g_malloc(18); if (!str) return NULL; @@ -1265,7 +1265,7 @@ struct connman_device *connman_device_create_from_index(int index) case CONNMAN_DEVICE_TYPE_CELLULAR: case CONNMAN_DEVICE_TYPE_GPS: case CONNMAN_DEVICE_TYPE_VENDOR: - name = strdup(devname); + name = g_strdup(devname); break; } diff --git a/src/inet.c b/src/inet.c index 23b02a2..a36642a 100644 --- a/src/inet.c +++ b/src/inet.c @@ -234,7 +234,7 @@ char *connman_inet_ifname(int index) if (err < 0) return NULL; - return strdup(ifr.ifr_name); + return g_strdup(ifr.ifr_name); } short int connman_inet_ifflags(int index) @@ -2280,7 +2280,7 @@ char **__connman_inet_get_running_interfaces(void) result[count++] = g_strdup(r->ifr_name); } - free(ifr); + g_free(ifr); if (count < numif) result = g_try_realloc(result, (count + 1) * sizeof(char *)); @@ -2289,7 +2289,7 @@ char **__connman_inet_get_running_interfaces(void) error: close(sk); - free(ifr); + g_free(ifr); return NULL; }