diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2000-09-11 23:43:59 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2000-09-11 23:43:59 +0000 |
| commit | f807f4b96c56c923f052b3beb1e9b682cabad0a5 (patch) | |
| tree | 7e7df069b42d8a342ed00c8e14df2b2f9c63df41 | |
| parent | df030a075f86284790b864703af83d771d3de27c (diff) | |
Just using standard malloc() since the xmalloc() didn't really add
anything useful to the command.
| -rw-r--r-- | src/filter.c | 35 | ||||
| -rw-r--r-- | src/filter.h | 6 |
2 files changed, 13 insertions, 28 deletions
diff --git a/src/filter.c b/src/filter.c index 4571b8a..8acfed2 100644 --- a/src/filter.c +++ b/src/filter.c @@ -1,4 +1,4 @@ -/* $Id: filter.c,v 1.1.1.1 2000-02-16 17:32:18 sdyoung Exp $ +/* $Id: filter.c,v 1.2 2000-09-11 23:43:59 rjkaes Exp $ * * Copyright (c) 1999 George Talusan (gstalusan@uwaterloo.ca) * @@ -16,27 +16,14 @@ * General Public License for more details. */ -#ifdef HAVE_CONFIG_H -#include <defines.h> -#endif - -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "tinyproxy.h" + #include <ctype.h> -#include <assert.h> +#include <sysexits.h> -#include "config.h" -#include "utils.h" -#include "tinyproxy.h" #include "filter.h" - #include "regexp.h" -#include <sysexits.h> +#include "utils.h" static int err; @@ -67,11 +54,11 @@ void filter_init(void) s = buf; if (!p) /* head of list */ fl = p = (struct filter_list *) - xmalloc(sizeof + malloc(sizeof (struct filter_list)); else { /* next entry */ p->next = (struct filter_list *) - xmalloc(sizeof + malloc(sizeof (struct filter_list)); p = p->next; } @@ -83,8 +70,8 @@ void filter_init(void) if (isspace((int) *s)) *s = '\0'; - p->pat = xstrdup(buf); - p->cpat = xmalloc(sizeof(regex_t)); + p->pat = strdup(buf); + p->cpat = malloc(sizeof(regex_t)); if ( (err = regcomp(p->cpat, p->pat, @@ -126,13 +113,11 @@ int filter_host(char *host) char *s, *port; int result; - assert(host); - if (!fl || !already_init) return (0); /* strip off the port number */ - s = xstrdup(host); + s = strdup(host); port = strchr(s, ':'); if (port) *port = '\0'; diff --git a/src/filter.h b/src/filter.h index fb08f2f..59ab33c 100644 --- a/src/filter.h +++ b/src/filter.h @@ -1,4 +1,4 @@ -/* $Id: filter.h,v 1.1.1.1 2000-02-16 17:32:24 sdyoung Exp $ +/* $Id: filter.h,v 1.2 2000-09-11 23:43:59 rjkaes Exp $ * * See 'filter.c' for a detailed description. * @@ -15,8 +15,8 @@ * General Public License for more details. */ -#ifndef __FILTER_H_ -#define __FILTER_H_ 1 +#ifndef _TINYPROXY_FILTER_H_ +#define _TINYPROXY_FILTER_H_ extern void filter_init(void); extern void filter_destroy(void); |