From af65c7448f988f67aefdd862c9337718e8bb3560 Mon Sep 17 00:00:00 2001 From: henri Date: Mon, 22 Apr 2013 19:31:14 +0000 Subject: [PATCH] Removed 'data_' prefixes to encoding/decoding functions to avoid confusion with functions that deal with proxy internal data structures. --- nsock/src/nsock_proxy.h | 4 ++-- nsock/src/proxy_http.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nsock/src/nsock_proxy.h b/nsock/src/nsock_proxy.h index c4a424fdf..a08399c9e 100644 --- a/nsock/src/nsock_proxy.h +++ b/nsock/src/nsock_proxy.h @@ -122,8 +122,8 @@ struct proxy_op { void (*handler)(nsock_pool nspool, nsock_event nsevent, void *udata); nsock_event_id (*connect_tcp)(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler handler, int mstimeout, void *userdata, struct sockaddr *saddr, size_t sslen, unsigned short port); - char *(*data_encode)(const char *src, size_t len, size_t *dlen); - char *(*data_decode)(const char *src, size_t len, size_t *dlen); + char *(*encode)(const char *src, size_t len, size_t *dlen); + char *(*decode)(const char *src, size_t len, size_t *dlen); }; diff --git a/nsock/src/proxy_http.c b/nsock/src/proxy_http.c index 5d53448dc..63744b253 100644 --- a/nsock/src/proxy_http.c +++ b/nsock/src/proxy_http.c @@ -68,8 +68,8 @@ static void proxy_http_handler(nsock_pool nspool, nsock_event nsevent, void *uda static nsock_event_id proxy_http_connect_tcp(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler handler, int timeout_msecs, void *userdata, struct sockaddr *saddr, size_t sslen, unsigned short port); -static char *proxy_http_data_encode(const char *src, size_t len, size_t *dlen); -static char *proxy_http_data_decode(const char *src, size_t len, size_t *dlen); +static char *proxy_http_encode(const char *src, size_t len, size_t *dlen); +static char *proxy_http_decode(const char *src, size_t len, size_t *dlen); /* ---- PROXY DEFINITION ---- */ @@ -79,8 +79,8 @@ const struct proxy_op proxy_http_ops = { .init = proxy_http_init, .handler = proxy_http_handler, .connect_tcp = proxy_http_connect_tcp, - .data_encode = proxy_http_data_encode, - .data_decode = proxy_http_data_decode + .encode = proxy_http_encode, + .decode = proxy_http_decode }; @@ -184,12 +184,12 @@ nsock_event_id proxy_http_connect_tcp(nsock_pool nsp, nsock_iod ms_iod, nsock_ev return nsock_connect_tcp_direct(nsp, ms_iod, handler, timeout_msecs, userdata, saddr, sslen, port); } -char *proxy_http_data_encode(const char *src, size_t len, size_t *dlen) { +char *proxy_http_encode(const char *src, size_t len, size_t *dlen) { // TODO return NULL; } -char *proxy_http_data_decode(const char *src, size_t len, size_t *dlen) { +char *proxy_http_decode(const char *src, size_t len, size_t *dlen) { // TODO return NULL; }