diff options
author | peter <peter@FreeBSD.org> | 1996-05-27 11:02:40 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1996-05-27 11:02:40 +0000 |
commit | 66dcddf6910e07082814643265c6131cde8e83ee (patch) | |
tree | f4067d5f342079f15ce0fa7a2ad85d6903fe2f01 /gnu/usr.bin/gdb | |
parent | e992bf35c6668c001ff4938494c9f7070a52ad87 (diff) | |
download | FreeBSD-src-66dcddf6910e07082814643265c6131cde8e83ee.zip FreeBSD-src-66dcddf6910e07082814643265c6131cde8e83ee.tar.gz |
Remove this version, it now comes from libc.
Diffstat (limited to 'gnu/usr.bin/gdb')
-rw-r--r-- | gnu/usr.bin/gdb/libiberty/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/gdb/libiberty/vasprintf.c | 139 |
2 files changed, 1 insertions, 140 deletions
diff --git a/gnu/usr.bin/gdb/libiberty/Makefile b/gnu/usr.bin/gdb/libiberty/Makefile index 2bc6abf..8387812 100644 --- a/gnu/usr.bin/gdb/libiberty/Makefile +++ b/gnu/usr.bin/gdb/libiberty/Makefile @@ -1,7 +1,7 @@ LIB= iberty SRCS= argv.c basename.c concat.c cplus-dem.c fdmatch.c getopt.c \ getopt1.c ieee-float.c obstack.c spaces.c strerror.c strsignal.c \ - vasprintf.c xmalloc.c + xmalloc.c CFLAGS+= -I$(.CURDIR)/../gdb/. NOPROFILE=no diff --git a/gnu/usr.bin/gdb/libiberty/vasprintf.c b/gnu/usr.bin/gdb/libiberty/vasprintf.c deleted file mode 100644 index b3ba0ca..0000000 --- a/gnu/usr.bin/gdb/libiberty/vasprintf.c +++ /dev/null @@ -1,139 +0,0 @@ -/* Like vsprintf but provides a pointer to malloc'd storage, which must - be freed by the caller. - Copyright (C) 1994 Free Software Foundation, Inc. - -This file is part of the libiberty library. -Libiberty is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -Libiberty is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with libiberty; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include <stdio.h> -#include <varargs.h> - -#ifdef TEST -int global_total_width; -#endif - -unsigned long strtoul (); -char *malloc (); - -int -vasprintf (result, format, args) - char **result; - char *format; - va_list args; -{ - char *p = format; - /* Add one to make sure that it is never zero, which might cause malloc - to return NULL. */ - int total_width = strlen (format) + 1; - va_list ap = args; - - while (*p != '\0') - { - if (*p++ == '%') - { - while (strchr ("-+ #0", *p)) - ++p; - if (*p == '*') - { - ++p; - total_width += abs (va_arg (ap, int)); - } - else - total_width += strtoul (p, &p, 10); - if (*p == '.') - { - ++p; - if (*p == '*') - { - ++p; - total_width += abs (va_arg (ap, int)); - } - else - total_width += strtoul (p, &p, 10); - } - while (strchr ("hlL", *p)) - ++p; - /* Should be big enough for any format specifier except %s. */ - total_width += 30; - switch (*p) - { - case 'd': - case 'i': - case 'o': - case 'u': - case 'x': - case 'X': - case 'c': - va_arg (ap, int); - break; - case 'f': - case 'e': - case 'E': - case 'g': - case 'G': - va_arg (ap, double); - break; - case 's': - total_width += strlen (va_arg (ap, char *)); - break; - case 'p': - case 'n': - va_arg (ap, char *); - break; - } - } - } -#ifdef TEST - global_total_width = total_width; -#endif - *result = malloc (total_width); - if (*result != NULL) - return vsprintf (*result, format, args); - else - return 0; -} - -#ifdef TEST -void -checkit (va_alist) - va_dcl -{ - va_list args; - char *format; - char *result; - - va_start (args); - format = va_arg (args, char *); - vasprintf (&result, format, args); - if (strlen (result) < global_total_width) - printf ("PASS: "); - else - printf ("FAIL: "); - printf ("%d %s\n", global_total_width, result); -} - -int -main () -{ - checkit ("%d", 0x12345678); - checkit ("%200d", 5); - checkit ("%.300d", 6); - checkit ("%100.150d", 7); - checkit ("%s", "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\ -777777777777777777333333333333366666666666622222222222777777777777733333"); - checkit ("%f%s%d%s", 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx"); -} -#endif /* TEST */ |