[src/trunk]: src/usr.sbin/traceroute byebye savestr. with savestr() we can't...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c27ad04c558e
branches:  trunk
changeset: 547233:c27ad04c558e
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu May 15 14:34:39 2003 +0000

description:
byebye savestr.  with savestr() we can't free().

diffstat:

 usr.sbin/traceroute/Makefile     |   4 +-
 usr.sbin/traceroute/ifaddrlist.c |   9 ++--
 usr.sbin/traceroute/savestr.c    |  75 ----------------------------------------
 usr.sbin/traceroute/savestr.h    |  26 -------------
 4 files changed, 6 insertions(+), 108 deletions(-)

diffs (171 lines):

diff -r 9f62c8b368bb -r c27ad04c558e usr.sbin/traceroute/Makefile
--- a/usr.sbin/traceroute/Makefile      Thu May 15 14:34:06 2003 +0000
+++ b/usr.sbin/traceroute/Makefile      Thu May 15 14:34:39 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2001/11/04 23:14:35 atatat Exp $       
+#      $NetBSD: Makefile,v 1.13 2003/05/15 14:34:39 itojun Exp $       
 
 PROG=  traceroute
 MAN=   traceroute.8 
@@ -14,7 +14,7 @@
 BINOWN= root
 BINMODE=4555
 
-SRCS=  traceroute.c savestr.c ifaddrlist.c 
+SRCS=  traceroute.c ifaddrlist.c 
 SRCS+= version.c as.c
 
 AWKS=  median.awk mean.awk 
diff -r 9f62c8b368bb -r c27ad04c558e usr.sbin/traceroute/ifaddrlist.c
--- a/usr.sbin/traceroute/ifaddrlist.c  Thu May 15 14:34:06 2003 +0000
+++ b/usr.sbin/traceroute/ifaddrlist.c  Thu May 15 14:34:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifaddrlist.c,v 1.5 2002/07/06 21:51:30 wiz Exp $       */
+/*     $NetBSD: ifaddrlist.c,v 1.6 2003/05/15 14:34:39 itojun Exp $    */
 
 /*
  * Copyright (c) 1997
@@ -39,7 +39,7 @@
 static const char rcsid[] =
     "@(#) Header: ifaddrlist.c,v 1.2 97/04/22 13:31:05 leres Exp  (LBL)";
 #else
-__RCSID("$NetBSD: ifaddrlist.c,v 1.5 2002/07/06 21:51:30 wiz Exp $");
+__RCSID("$NetBSD: ifaddrlist.c,v 1.6 2003/05/15 14:34:39 itojun Exp $");
 #endif
 #endif
 
@@ -76,7 +76,6 @@
 #endif
 
 #include "ifaddrlist.h"
-#include "savestr.h"
 
 
 /* Not all systems have IFF_LOOPBACK */
@@ -135,7 +134,7 @@
                                continue;
 
                al->addr = sin->sin_addr.s_addr;
-               al->device = savestr(ifa->ifa_name);
+               al->device = strdup(ifa->ifa_name);
                ++al;
                ++nipaddr;
        }
@@ -220,7 +219,7 @@
                device[sizeof(device) - 1] = '\0';
 
                al->addr = sin->sin_addr.s_addr;
-               al->device = savestr(device);
+               al->device = strdup(device);
                ++al;
                ++nipaddr;
        }
diff -r 9f62c8b368bb -r c27ad04c558e usr.sbin/traceroute/savestr.c
--- a/usr.sbin/traceroute/savestr.c     Thu May 15 14:34:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*     $NetBSD: savestr.c,v 1.3 2003/05/15 00:08:10 itojun Exp $       */
-
-/*
- * Copyright (c) 1997
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static const char rcsid[] =
-    "@(#) Header: savestr.c,v 1.2 97/05/09 14:52:31 leres Exp  (LBL)";
-#else
-__RCSID("$NetBSD: savestr.c,v 1.3 2003/05/15 00:08:10 itojun Exp $");
-#endif
-#endif
-
-#include <sys/types.h>
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "gnuc.h"
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
-#include "savestr.h"
-
-/* A replacement for strdup() that cuts down on malloc() overhead */
-char *
-savestr(const char *str)
-{
-       size_t size;
-       char *p;
-       static char *strptr = NULL;
-       static u_int strsize = 0;
-
-       size = strlen(str) + 1;
-       if (size > strsize) {
-               strsize = 1024;
-               if (strsize < size)
-                       strsize = size;
-               strptr = (char *)malloc(strsize);
-               if (strptr == NULL) {
-                       fprintf(stderr, "savestr: malloc\n");
-                       exit(1);
-               }
-       }
-       (void)strlcpy(strptr, str, strsize);
-       p = strptr;
-       strptr += size;
-       strsize -= size;
-       return (p);
-}
diff -r 9f62c8b368bb -r c27ad04c558e usr.sbin/traceroute/savestr.h
--- a/usr.sbin/traceroute/savestr.h     Thu May 15 14:34:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*     $NetBSD: savestr.h,v 1.1.1.1 1997/10/03 22:25:19 christos Exp $ */
-
-/*
- * Copyright (c) 1997
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) Header: savestr.h,v 1.1 97/04/22 13:30:21 leres Exp  (LBL)
- */
-
-extern char *savestr(const char *);