diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2004-07-30 10:45:28 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2004-07-30 10:45:28 +0000 |
| commit | 7d7e1ae20e403afdbc4fee4e8468772459516058 (patch) | |
| tree | 973dbaf6bf223debad169633f8fadf2073fcb5de | |
| parent | 7a7314f77e046698c24f2abc4288112f94df7276 (diff) | |
Style.
| -rw-r--r-- | sbin/isakmpd/Makefile | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep.h | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/util.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile index f3e7d1136c7..39d3dd96437 100644 --- a/sbin/isakmpd/Makefile +++ b/sbin/isakmpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2004/06/23 01:17:29 ho Exp $ +# $OpenBSD: Makefile,v 1.56 2004/07/30 10:45:27 ho Exp $ # $EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $ # @@ -96,7 +96,7 @@ CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes \ # If you like to use Boehm's garbage collector (/usr/ports/devel/boehm-gc). #LDADD+= -L/usr/local/lib -lgc #DPADD+= /usr/local/lib/libgc.a -#CFLAGS+= -DUSE_BOEHM_GC +#CFLAGS+= -DUSE_BOEHM_GC -DGC_DEBUG # You can also use Boehm's garbage collector as a means to find leaks. # # setenv GC_FIND_LEAK diff --git a/sbin/isakmpd/sysdep.h b/sbin/isakmpd/sysdep.h index a8745f41884..b82c70e3bf9 100644 --- a/sbin/isakmpd/sysdep.h +++ b/sbin/isakmpd/sysdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysdep.h,v 1.16 2004/06/23 01:17:29 ho Exp $ */ +/* $OpenBSD: sysdep.h,v 1.17 2004/07/30 10:45:27 ho Exp $ */ /* $EOM: sysdep.h,v 1.17 2000/12/04 04:46:35 angelos Exp $ */ /* @@ -72,13 +72,13 @@ extern u_int8_t sysdep_sa_len(struct sockaddr *); void *GC_debug_malloc(size_t, char *, int); void *GC_debug_realloc(void *, size_t, char *, int); void GC_debug_free(void *); -char *my_strdup(const char *); +char *gc_strdup(const char *); #define malloc(x) GC_debug_malloc ((x), __FILE__, __LINE__) #define realloc(x,y) GC_debug_realloc ((x), (y), __FILE__, __LINE__) #define free(x) GC_debug_free (x) #define calloc(x,y) malloc((x) * (y)) -#define strdup(x) my_strdup((x)) +#define strdup(x) gc_strdup((x)) #endif /* WITH_BOEHM_GC */ diff --git a/sbin/isakmpd/util.c b/sbin/isakmpd/util.c index 6d15ca201f5..bbe01dee400 100644 --- a/sbin/isakmpd/util.c +++ b/sbin/isakmpd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.46 2004/06/25 19:42:38 mcbride Exp $ */ +/* $OpenBSD: util.c,v 1.47 2004/07/30 10:45:27 ho Exp $ */ /* $EOM: util.c,v 1.23 2000/11/23 12:22:08 niklas Exp $ */ /* @@ -476,7 +476,7 @@ check_file_secrecy_fd(int fd, char *name, size_t *file_size) /* Special for compiling with Boehms GC. See Makefile and sysdep.h */ #if defined (USE_BOEHM_GC) char * -my_strdup(const char *x) +gc_strdup(const char *x) { char *strcpy(char *,const char *); char *y = malloc(strlen(x) + 1); |