aboutsummaryrefslogtreecommitdiffstats
path: root/proxy/proxy_common.c
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:43:59 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:43:59 -0800
commitc27f813900a3c114562efbb8df1065e94766fc48 (patch)
treed95919283707dcab61009e27007374a745c9541e /proxy/proxy_common.c
parent0852ad57fa372f9b2854e4df685eaba8d8ef6790 (diff)
downloadexternal_qemu-c27f813900a3c114562efbb8df1065e94766fc48.zip
external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.gz
external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.bz2
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'proxy/proxy_common.c')
-rw-r--r--proxy/proxy_common.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/proxy/proxy_common.c b/proxy/proxy_common.c
index ffe8e22..7794a62 100644
--- a/proxy/proxy_common.c
+++ b/proxy/proxy_common.c
@@ -15,7 +15,9 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include "vl.h"
+#include "android/utils/misc.h"
+#include "android/utils/system.h"
+#include <stdlib.h>
int proxy_log = 0;
@@ -505,9 +507,7 @@ proxy_resolve_server( SockAddress* addr,
servernamelen = strlen(servername);
if (servernamelen >= sizeof(name0)) {
- name = qemu_malloc(servernamelen+1);
- if (name == NULL)
- return -1;
+ AARRAY_NEW(name, servernamelen+1);
}
memcpy(name, servername, servernamelen);
@@ -524,7 +524,7 @@ proxy_resolve_server( SockAddress* addr,
Exit:
if (name != name0)
- qemu_free(name);
+ AFREE(name);
return result;
}