diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:59 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:59 -0800 |
| commit | c27f813900a3c114562efbb8df1065e94766fc48 (patch) | |
| tree | d95919283707dcab61009e27007374a745c9541e /proxy | |
| parent | 0852ad57fa372f9b2854e4df685eaba8d8ef6790 (diff) | |
| download | external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.zip external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.gz external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.bz2 | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'proxy')
| -rw-r--r-- | proxy/proxy_common.c | 10 | ||||
| -rw-r--r-- | proxy/proxy_http.c | 2 | ||||
| -rw-r--r-- | proxy/proxy_http_connector.c | 2 | ||||
| -rw-r--r-- | proxy/proxy_http_rewriter.c | 4 | ||||
| -rw-r--r-- | proxy/proxy_int.h | 2 |
5 files changed, 10 insertions, 10 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; } diff --git a/proxy/proxy_http.c b/proxy/proxy_http.c index 5c185ca..f753587 100644 --- a/proxy/proxy_http.c +++ b/proxy/proxy_http.c @@ -11,10 +11,10 @@ */ #include "proxy_int.h" #include "proxy_http_int.h" +#include "qemu-common.h" #include <errno.h> #include <stdio.h> #include <string.h> -#include "vl.h" #define HTTP_VERSION "1.1" diff --git a/proxy/proxy_http_connector.c b/proxy/proxy_http_connector.c index 7bf2f53..6f03d9b 100644 --- a/proxy/proxy_http_connector.c +++ b/proxy/proxy_http_connector.c @@ -13,7 +13,7 @@ #include <errno.h> #include <stdio.h> #include <string.h> -#include "vl.h" +#include "qemu-common.h" /* A HttpConnector implements a non-HTTP proxied connection * through the CONNECT method. Many firewalls are configured diff --git a/proxy/proxy_http_rewriter.c b/proxy/proxy_http_rewriter.c index f0bfbbc..812bf9c 100644 --- a/proxy/proxy_http_rewriter.c +++ b/proxy/proxy_http_rewriter.c @@ -10,10 +10,10 @@ ** GNU General Public License for more details. */ #include "proxy_http_int.h" -#include "android_utils.h" #include <stdio.h> #include <string.h> -#include "vl.h" +#include "qemu-common.h" +#include "android/utils/system.h" /* strsep */ /* this implements a transparent HTTP rewriting proxy * diff --git a/proxy/proxy_int.h b/proxy/proxy_int.h index 9bdac5c..739bb75 100644 --- a/proxy/proxy_int.h +++ b/proxy/proxy_int.h @@ -14,7 +14,7 @@ #include "proxy_common.h" #include "sockets.h" -#include "android_utils.h" +#include "android/utils/stralloc.h" extern int proxy_log; |