summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko2007-01-03 02:56:00 +0000
committerDenis Vlasenko2007-01-03 02:56:00 +0000
commit9b1381fd2fb7179f731709542507015799f90a51 (patch)
tree66b3617e0b6ceed9c3123000104df0d78bf9bf2a /networking
parentbb3d0fab3b46d64e93687bc30b405d0878eca296 (diff)
downloadbusybox-9b1381fd2fb7179f731709542507015799f90a51.zip
busybox-9b1381fd2fb7179f731709542507015799f90a51.tar.gz
convert calloc to xzalloc
fix sleep-on-die option
Diffstat (limited to 'networking')
-rw-r--r--networking/httpd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index e50955d..ff5c146 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -499,7 +499,7 @@ static void parse_conf(const char *path, int flag)
continue;
if (*p0 == 'A' || *p0 == 'D') {
/* storing current config IP line */
- pip = calloc(1, sizeof(Htaccess_IP));
+ pip = xzalloc(sizeof(Htaccess_IP));
if (pip) {
if (scan_ip_mask(c, &(pip->ip), &(pip->mask))) {
/* syntax IP{/mask} error detected, protect all */
@@ -570,7 +570,7 @@ static void parse_conf(const char *path, int flag)
|| ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES \
|| ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
/* storing current config line */
- cur = calloc(1, sizeof(Htaccess) + strlen(p0));
+ cur = xzalloc(sizeof(Htaccess) + strlen(p0));
if (cur) {
cf = strcpy(cur->before_colon, p0);
c = strchr(cf, ':');