From 7fe5c487434b04e1cf3f4984fd27347912c61b75 Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Tue, 20 Aug 2013 21:29:05 +0100 Subject: [PATCH] replace calloc http/request.c with quick fit approach. --- src/http/parser/p_request_vars.c | 4 +++- src/http/request.c | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/http/parser/p_request_vars.c b/src/http/parser/p_request_vars.c index fbcf192..464c3a2 100644 --- a/src/http/parser/p_request_vars.c +++ b/src/http/parser/p_request_vars.c @@ -29,6 +29,8 @@ #include "hash.h" #include "class.h" +#include "utils/memory.h" + void httpParserRequestVars(HttpParser this) { @@ -39,7 +41,7 @@ httpParserRequestVars(HttpParser this) delim = request->uri + strlen(request->uri); } - request->path = malloc(delim - request->uri + 1); + request->path = memMalloc(delim - request->uri + 1); request->path[delim - request->uri] = 0; memcpy(request->path, request->uri, delim - request->uri); diff --git a/src/http/request.c b/src/http/request.c index b380301..3054632 100644 --- a/src/http/request.c +++ b/src/http/request.c @@ -48,11 +48,11 @@ httpRequestCtor(void * _this, va_list * params) PARENTCALL(_this, Class, ctor, params); - this->method = malloc(mlen + 1); + this->method = memMalloc(mlen + 1); this->method[mlen] = 0; memcpy(this->method, method, mlen); - this->uri = malloc(ulen + 1); + this->uri = memMalloc(ulen + 1); this->uri[ulen] = 0; memcpy(this->uri, uri, ulen); @@ -73,9 +73,9 @@ httpRequestDtor(void * _this) delete(this->post); delete(this->cookies); - FREE(this->uri); - FREE(this->method); - FREE(this->path); + MEM_FREE(this->uri); + MEM_FREE(this->method); + MEM_FREE(this->path); PARENTCALL(_this, Class, dtor); }