Skip to content

Commit cdb59a3

Browse files
committed
remove zmalloc
1 parent fc9d146 commit cdb59a3

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/request.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include <stdlib.h>
3434
#include <stdio.h>
3535
#include <string.h>
36-
#include "zmalloc.h"
3736
#include "request.h"
3837

3938
/* useful symbols:
@@ -147,7 +146,7 @@ int request_parse(struct request *req)
147146
}
148147
req->argc=atoi(sb);
149148

150-
req->argv=(char**)zmalloc(sizeof(char*)*req->argc);
149+
req->argv=(char**)calloc(req->argc,sizeof(char*));
151150
for(i=0;i<req->argc;i++){
152151
int argv_len;
153152
char *v;
@@ -161,7 +160,7 @@ int request_parse(struct request *req)
161160
argv_len=atoi(sb);
162161

163162
/*get argv*/
164-
v=(char*)zmalloc(sizeof(char)*argv_len);
163+
v=(char*)malloc(sizeof(char)*argv_len);
165164
memcpy(v,req->querybuf+(req->pos),argv_len);
166165
req->argv[i]=v;
167166
req->pos+=(argv_len+2);
@@ -189,9 +188,9 @@ void request_free(struct request *req)
189188
if(req){
190189
for(i=0;i<req->argc;i++){
191190
if(req->argv[i])
192-
zfree(req->argv[i]);
191+
free(req->argv[i]);
193192
}
194-
zfree(req->argv);
193+
free(req->argv);
195194
free(req);
196195
}
197196
}

0 commit comments

Comments
 (0)