gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lots of tidying up.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13608 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-05-08 05:43:15 +00:00
parent 6c1305515d
commit a38c844fd9
17 changed files with 48 additions and 649 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2002-05-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSXML.m: Fix function prototype ... gets rid of
compiler warning.
* Source/GNUmakefile: remove o_vscanf.c ... unused
* Source/o_vscanf.c: remove unused file.
* Source/mframe.m: Fix compiler warning about unused function.
* Source/GSFormat.m: Fix compiler warning about unused var.
* Source/NSDebug.m: Fix compiler warning about unused var.
* Source/externs.m: Fix compiler warnings ... move some exceptions
to source files relating to where they are declared.
* Source/NSArchiver.m: define exception.
* Source/NSConnection.m: define exception.
* Source/NSPort.m: define exception.
* Tools/gdomap.c: Remove unused variable (log_perror).
2002-05-07 Adam Fedor <fedor@gnu.org>
* configure.ac: Make all AC_DEFINES define 1

2
Headers/gnustep/base/NSArchiver.h
View file

@ -242,6 +242,6 @@
/* Exceptions */
GS_EXPORT NSString* const NSInconsistentArchiveException;
GS_EXPORT NSString * const NSInconsistentArchiveException;
#endif /* __NSArchiver_h_GNUSTEP_BASE_INCLUDE */

8
Headers/gnustep/base/NSConnection.h
View file

@ -235,9 +235,9 @@ GS_EXPORT NSString *ConnectionBecameInvalidNotification;
/*
* NSRunLoop mode, NSNotification name and NSException strings.
*/
GS_EXPORT NSString *NSConnectionReplyMode;
GS_EXPORT NSString *NSConnectionDidDieNotification;
GS_EXPORT NSString *NSConnectionDidInitializeNotification; /* OPENSTEP */
GS_EXPORT NSString *NSFailedAuthenticationException; /* MacOS-X */
GS_EXPORT NSString * const NSConnectionReplyMode;
GS_EXPORT NSString * const NSConnectionDidDieNotification;
GS_EXPORT NSString * const NSConnectionDidInitializeNotification; /* OPENSTEP */
GS_EXPORT NSString * const NSFailedAuthenticationException; /* MacOS-X */
#endif /* __NSConnection_h_GNUSTEP_BASE_INCLUDE */

2
Headers/gnustep/base/NSPort.h
View file

@ -32,7 +32,7 @@
@class NSRunLoop;
@class NSString;
GS_EXPORT NSString *NSPortTimeoutException; /* OPENSTEP */
GS_EXPORT NSString * const NSPortTimeoutException; /* OPENSTEP */
@interface NSPort : NSObject <NSCoding, NSCopying>
{

2
Headers/gnustep/base/objc-load.h
View file

@ -12,7 +12,7 @@
#include <objc/objc-api.h>
#include <Foundation/NSString.h>
#if HAVE_DLADDR
#ifdef HAVE_DLADDR
#define LINKER_GETSYMBOL 1
#else
#define LINKER_GETSYMBOL 0

4
Source/Additions/GSXML.m
View file

@ -107,7 +107,7 @@ setupCache()
}
static xmlParserInputPtr
loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr *ctxt);
loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr ctxt);
/* Internal interfaces */
@ -2167,7 +2167,7 @@ static NSString *endMarker = @"At end of incremental parse";
#define HANDLER (GSSAXHandler*)(((xmlParserCtxtPtr)ctx)->_private)
static xmlParserInputPtr
loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr *ctx)
loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr ctx)
{
extern xmlParserInputPtr xmlNewInputFromFile();
NSString *file;

3
Source/GNUmakefile
View file

@ -107,8 +107,7 @@ endif
GNU_CFILES = \
md5.c \
numbers.c \
o_vscanf.c
numbers.c
GNU_OTHER_SRCFILES = \
md5.h \

4
Source/GSFormat.m
View file

@ -1085,7 +1085,9 @@ NSDictionary *locale)
int left = specs[nspecs_done].info.left;
int showsign = specs[nspecs_done].info.showsign;
int group = specs[nspecs_done].info.group;
#if defined(LONG_LONG_MAX) && (LONG_MAX != LONG_LONG_MAX)
int is_long_double = specs[nspecs_done].info.is_long_double;
#endif
int is_short = specs[nspecs_done].info.is_short;
int is_char = specs[nspecs_done].info.is_char;
int is_long = specs[nspecs_done].info.is_long;
@ -1708,7 +1710,7 @@ NSDictionary *locale)
LABEL (form_string):
{
size_t len;
size_t len = 0;
/* The string argument could in fact be `char *' or `wchar_t *'.
But this should not make a difference here. */

2
Source/NSArchiver.m
View file

@ -51,6 +51,8 @@
typedef unsigned char uchar;
NSString * const NSInconsistentArchiveException =
@"NSInconsistentArchiveException";
#define PREFIX "GNUstep archive"

3
Source/NSConnection.m
View file

@ -85,6 +85,9 @@
#define M_LOCK(X) {NSDebugMLLog(@"GSConnection",@"Lock %@",X);[X lock];}
#define M_UNLOCK(X) {NSDebugMLLog(@"GSConnection",@"Unlock %@",X);[X unlock];}
NSString * const NSFailedAuthenticationException =
@"NSFailedAuthenticationExceptions";
/*
* Set up a type to permit us to have direct access into an NSDistantObject
*/

2
Source/NSDebug.m
View file

@ -652,7 +652,7 @@ GSDebugMethodMsg(id obj, SEL sel, const char *file, int line, NSString *fmt)
return message;
}
static void *_frameOffsets[100];
// static void *_frameOffsets[100];
#define _NS_FRAME_HACK(a) case a: return __builtin_frame_address(a + 1)
#define _NS_RETURN_HACK(a) case a: return __builtin_return_address(a + 1)

2
Source/NSPort.m
View file

@ -38,6 +38,8 @@
@implementation NSPort
NSString * const NSPortTimeoutException = @"NSPortTimeoutException";
Class NSPort_abstract_class;
Class NSPort_concrete_class;

6
Source/NSString.m
View file

@ -797,7 +797,7 @@ handle_printf_atsign (FILE *stream,
int printed_len = 0;
NSString *ret;
#if ! HAVE_REGISTER_PRINTF_FUNCTION
#ifndef HAVE_REGISTER_PRINTF_FUNCTION
NSZone *z = GSObjCZone(self);
/* If the available libc doesn't have `register_printf_function()', then
@ -967,7 +967,7 @@ handle_printf_atsign (FILE *stream,
#endif /* !HAVE_REGISTER_PRINTF_FUNCTION */
ret = [self initWithCString: buf];
#if ! HAVE_REGISTER_PRINTF_FUNCTION
#ifndef HAVE_REGISTER_PRINTF_FUNCTION
NSZoneFree(z, buf);
#else
free(buf);
@ -979,7 +979,7 @@ handle_printf_atsign (FILE *stream,
char buf[format_len + BUFFER_EXTRA];
int printed_len = 0;
#if ! HAVE_REGISTER_PRINTF_FUNCTION
#ifndef HAVE_REGISTER_PRINTF_FUNCTION
/* If the available libc doesn't have `register_printf_function()', then
the `%@' printf directive isn't available with printf() and friends.
Here we make a feable attempt to handle it. */

16
Source/externs.m
View file

@ -79,20 +79,14 @@ NSString *NSConnectionReplyMode;
/* Exceptions */
NSString * const NSCharacterConversionException;
NSString * const NSFailedAuthenticationException;
NSString * const NSGenericException;
NSString * const NSInconsistentArchiveException;
NSString * const NSInternalInconsistencyException;
NSString * const NSInvalidArgumentException;
NSString * const NSMallocException;
NSString * const NSPortTimeoutException;
NSString * const NSRangeException;
@ -308,12 +302,14 @@ GSBuildStrings()
if (SClass == 0)
{
SClass = [NSString class];
/*
* Ensure that NSString is initialized ... because we are called
* from [NSObject +initialize] which might be executing as a
* result of a call to [NSString +initialize] !
*/
[SClass initialize];
InPortAcceptedClientNotification
= [[SClass alloc] initWithCString:
"InPortAcceptedClientNotification"];
@ -365,9 +361,6 @@ GSBuildStrings()
= [[SClass alloc] initWithCString: "NSDefaultRunLoopMode"];
NSEarlierTimeDesignations
= [[SClass alloc] initWithCString: "NSEarlierTimeDesignations"];
NSFailedAuthenticationException
= [[SClass alloc] initWithCString:
"NSFailedAuthenticationException"];
NSFileDeviceIdentifier
= [[SClass alloc] initWithCString: "NSFileDeviceIdentifier"];
NSFileGroupOwnerAccountName
@ -424,9 +417,6 @@ GSBuildStrings()
= [[SClass alloc] initWithCString: "NSGlobalDomain"];
NSHourNameDesignations
= [[SClass alloc] initWithCString: "NSHourNameDesignations"];
NSInconsistentArchiveException
= [[SClass alloc] initWithCString:
"NSInconsistentArchiveException"];
*(NSString**)&NSInternalInconsistencyException
= [[SClass alloc] initWithCString:
"NSInternalInconsistencyException"];
@ -458,8 +448,6 @@ GSBuildStrings()
NSPortDidBecomeInvalidNotification
= [[SClass alloc] initWithCString:
"NSPortDidBecomeInvalidNotification"];
NSPortTimeoutException
= [[SClass alloc] initWithCString: "NSPortTimeoutException"];
NSPositiveCurrencyFormatString
= [[SClass alloc] initWithCString:
"NSPositiveCurrencyFormatString"];

8
Source/mframe.m
View file

@ -42,10 +42,10 @@
#include <ctype.h>
/* Deal with strrchr: */
#if STDC_HEADERS || HAVE_STRING_H
#if STDC_HEADERS || defined(HAVE_STRING_H)
#include <string.h>
/* An ANSI string.h and pre-ANSI memory.h might conflict. */
#if !STDC_HEADERS && HAVE_MEMORY_H
#if !STDC_HEADERS && defined(HAVE_MEMORY_H)
#include <memory.h>
#endif /* not STDC_HEADERS and HAVE_MEMORY_H */
#define index strchr
@ -1245,12 +1245,14 @@ mframe_do_call (DOContext *ctxt,
return;
}
#if 0
/* For returning structures etc */
typedef struct { id many[8];} __big;
static __big return_block (void* data)
{
return *(__big*)data;
}
#endif
/* For returning a char (or unsigned char) */
static char return_char (char data)
{
@ -1271,11 +1273,13 @@ static short return_short (short data)
{
return data;
}
#if 0
static retval_t apply_block(void* data)
{
void* args = __builtin_apply_args();
return __builtin_apply((apply_t)return_block, args, sizeof(void*));
}
#endif
static retval_t apply_char(char data)
{
void* args = __builtin_apply_args();

616
Source/o_vscanf.c
View file

@ -1,616 +0,0 @@
/* Implementation of o_vscanf for GNUstep Base Library
Reworked by: Andrew Kachites McCallum <mccallum@gnu.ai.mit.edu>
Date: July 1994
This file is part of the GNUstep Base Library.
This library 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.
This library 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 this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
/* Copyright (C) 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library 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.
The GNU C Library 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 the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02111, USA. */
/* Reworked from glibc by Andrew McCallum:
Fixed bug by adding "*f == 'a'" to type modifier checking.
Declared extern strtod and strtol.
Use function pointer argument to get next character.
Use objc_malloc() instead of malloc()
Use objc_realloc() instead of realloc()
This is a solution for StdioStream and MemoryStream.
It isn't ideal. Anyone have other suggestions? */
/* #include <ansidecl.h> */
/* #include <localeinfo.h> */
#include <errno.h>
#include <limits.h>
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <objc/objc-api.h>
extern double strtod(const char *str, char **ptr);
extern long strtol(const char *str, char** ptr, int base);
#ifdef __GNUC__
#define HAVE_LONGLONG
#define LONGLONG long long
#define CONST const
#define LONG_DOUBLE long double
#else
#define LONGLONG long
#define CONST
#endif
/* #define inchar() ((c = getc(s)) == EOF ? EOF : (++read_in, c))*/
#define inchar() ((c = (*inchar_func)(stream)) == EOF ? EOF : (++read_in, c))
/* #define conv_error() return ((c == EOF || ungetc(c, s)), done) */
//#define conv_error() return ((c == EOF || ((*unchar_func)(stream,c),c)), done)
#define conv_error() return (c==EOF ? done : ((*unchar_func)(stream,c), done))
#define input_error() return (done == 0 ? EOF : done)
#define memory_error() return ((errno = ENOMEM), EOF)
/* Read formatted input from STREAM according to the format string
FORMAT, using the argument list in ARGPTR.
Return the number of assignments made, or -1 for an input error. */
int
o_vscanf (void *stream,
int (*inchar_func)(void*),
void (*unchar_func)(void*,int),
const char *format, va_list arg)
{
register CONST char *f = format;
register char fc; /* Current character of the format. */
register size_t done = 0; /* Assignments done. */
register size_t read_in = 0; /* Chars read in. */
register int c; /* Last char read. */
register int do_assign; /* Whether to do an assignment. */
register int width; /* Maximum field width. */
/* Type modifiers. */
char is_short, is_long, is_long_double;
#ifdef HAVE_LONGLONG
/* We use the `L' modifier for `long long int'. */
#define is_longlong is_long_double
#else
#define is_longlong 0
#endif
int malloc_string; /* Args are char ** to be filled in. */
/* Status for reading F-P nums. */
char got_dot, got_e;
/* If a [...] is a [^...]. */
char not_in;
/* Base for integral numbers. */
int base;
/* Signedness for integral numbers. */
int number_signed;
/* Integral holding variables. */
long int num;
unsigned long int unum;
/* Floating-point holding variable. */
LONG_DOUBLE fp_num;
/* Character-buffer pointer. */
register char *str, **strptr;
size_t strsize;
/* Workspace. */
char work[200];
char *w; /* Pointer into WORK. */
wchar_t decimal; /* Decimal point character. */
#if 0
if (!__validfp(s) || !s->__mode.__read || format == NULL)
{
errno = EINVAL;
return EOF;
}
#endif
/* Figure out the decimal point character. */
#if 0
if (mbtowc(&decimal, _numeric_info->decimal_point,
strlen(_numeric_info->decimal_point)) <= 0)
decimal = (wchar_t) *_numeric_info->decimal_point;
#else
decimal = '.';
#endif
c = inchar();
/* Run through the format string. */
while (*f != '\0')
{
if (!isascii(*f))
{
/* Non-ASCII, may be a multibyte. */
int len = mblen(f, strlen(f));
if (len > 0)
{
while (len-- > 0)
if (c == EOF)
input_error();
else if (c == *f++)
(void) inchar();
else
conv_error();
continue;
}
}
fc = *f++;
if (fc != '%')
{
/* Characters other than format specs must just match. */
if (c == EOF)
input_error();
if (isspace(fc))
{
/* Whitespace characters match any amount of whitespace. */
while (isspace (c))
inchar ();
continue;
}
else if (c == fc)
(void) inchar();
else
conv_error();
continue;
}
/* Check for the assignment-suppressant. */
if (*f == '*')
{
do_assign = 0;
++f;
}
else
do_assign = 1;
/* Find the maximum field width. */
width = 0;
while (isdigit(*f))
{
width *= 10;
width += *f++ - '0';
}
if (width == 0)
width = -1;
/* Check for type modifiers. */
is_short = is_long = is_long_double = malloc_string = 0;
while (*f == 'h' || *f == 'l' || *f == 'L' || *f == 'a')
switch (*f++)
{
case 'h':
/* int's are short int's. */
is_short = 1;
break;
case 'l':
if (is_long)
/* A double `l' is equivalent to an `L'. */
is_longlong = 1;
else
/* int's are long int's. */
is_long = 1;
break;
case 'L':
/* double's are long double's, and int's are long long int's. */
is_long_double = 1;
break;
case 'a':
/* String conversions (%s, %[) take a `char **'
arg and fill it in with a malloc'd pointer. */
malloc_string = 1;
break;
}
/* End of the format string? */
if (*f == '\0')
conv_error();
/* Find the conversion specifier. */
w = work;
fc = *f++;
if (fc != '[' && fc != 'c' && fc != 'n')
/* Eat whitespace. */
while (isspace(c))
(void) inchar();
switch (fc)
{
case '%': /* Must match a literal '%'. */
if (c != fc)
conv_error();
break;
case 'n': /* Answer number of assignments done. */
if (do_assign)
*va_arg(arg, int *) = read_in;
break;
case 'c': /* Match characters. */
if (do_assign)
{
str = va_arg (arg, char *);
if (str == NULL)
conv_error ();
}
if (c == EOF)
input_error();
if (width == -1)
width = 1;
if (do_assign)
{
do
*str++ = c;
while (inchar() != EOF && --width > 0);
}
else
while (inchar() != EOF && width > 0)
--width;
if (do_assign)
++done;
break;
case 's': /* Read a string. */
#define STRING_ARG \
if (do_assign) \
{ \
if (malloc_string) \
{ \
/* The string is to be stored in a malloc'd buffer. */ \
strptr = va_arg (arg, char **); \
if (strptr == NULL) \
conv_error (); \
/* Allocate an initial buffer. */ \
strsize = 100; \
*strptr = str = objc_malloc (strsize); \
} \
else \
str = va_arg (arg, char *); \
if (str == NULL) \
conv_error (); \
}
STRING_ARG;
if (c == EOF)
input_error ();
do
{
if (isspace (c))
break;
#define STRING_ADD_CHAR(c) \
if (do_assign) \
{ \
*str++ = c; \
if (malloc_string && str == *strptr + strsize) \
{ \
/* Enlarge the buffer. */ \
str = objc_realloc (*strptr, strsize * 2); \
if (str == NULL) \
{ \
/* Can't allocate that much. Last-ditch effort. */\
str = objc_realloc (*strptr, strsize + 1); \
if (str == NULL) \
{ \
/* We lose. Oh well. \
Terminate the string and stop converting, \
so at least we don't swallow any input. */ \
(*strptr)[strsize] = '\0'; \
++done; \
conv_error (); \
} \
else \
{ \
*strptr = str; \
str += strsize; \
++strsize; \
} \
} \
else \
{ \
*strptr = str; \
str += strsize; \
strsize *= 2; \
} \
} \
}
STRING_ADD_CHAR (c);
} while (inchar () != EOF && (width <= 0 || --width > 0));
if (do_assign)
{
*str = '\0';
++done;
}
break;
case 'x': /* Hexadecimal integer. */
case 'X': /* Ditto. */
base = 16;
number_signed = 0;
goto number;
case 'o': /* Octal integer. */
base = 8;
number_signed = 0;
goto number;
case 'u': /* Unsigned decimal integer. */
base = 10;
number_signed = 0;
goto number;
case 'd': /* Signed decimal integer. */
base = 10;
number_signed = 1;
goto number;
case 'i': /* Generic number. */
base = 0;
number_signed = 1;
number:
if (c == EOF)
input_error();
/* Check for a sign. */
if (c == '-' || c == '+')
{
*w++ = c;
if (width > 0)
--width;
(void) inchar();
}
/* Look for a leading indication of base. */
if (c == '0')
{
if (width > 0)
--width;
*w++ = '0';
(void) inchar();
if (tolower(c) == 'x')
{
if (base == 0)
base = 16;
if (base == 16)
{
if (width > 0)
--width;
(void) inchar();
}
}
else if (base == 0)
base = 8;
}
if (base == 0)
base = 10;
/* Read the number into WORK. */
do
{
if (base == 16 ? !isxdigit(c) :
(!isdigit(c) || c - '0' >= base))
break;
*w++ = c;
if (width > 0)
--width;
} while (inchar() != EOF && width != 0);
if (w == work ||
(w - work == 1 && (work[0] == '+' || work[0] == '-')))
/* There was on number. */
conv_error();
/* Convert the number. */
*w = '\0';
if (number_signed)
num = strtol (work, &w, base);
else
#if HAVE_STRTOUL
unum = strtoul (work, &w, base);
#else
unum = (unsigned long) strtol (work, &w, base);
#endif
if (w == work)
conv_error ();
if (do_assign)
{
if (! number_signed)
{
if (is_longlong)
*va_arg (arg, unsigned LONGLONG int *) = unum;
else if (is_long)
*va_arg (arg, unsigned long int *) = unum;
else if (is_short)
*va_arg (arg, unsigned short int *)
= (unsigned short int) unum;
else
*va_arg(arg, unsigned int *) = (unsigned int) unum;
}
else
{
if (is_longlong)
*va_arg(arg, LONGLONG int *) = num;
else if (is_long)
*va_arg(arg, long int *) = num;
else if (is_short)
*va_arg(arg, short int *) = (short int) num;
else
*va_arg(arg, int *) = (int) num;
}
++done;
}
break;
case 'e': /* Floating-point numbers. */
case 'E':
case 'f':
case 'g':
case 'G':
if (c == EOF)
input_error();
/* Check for a sign. */
if (c == '-' || c == '+')
{
*w++ = c;
if (inchar() == EOF)
/* EOF is only an input error before we read any chars. */
conv_error();
if (width > 0)
--width;
}
got_dot = got_e = 0;
do
{
if (isdigit(c))
*w++ = c;
else if (got_e && w[-1] == 'e' && (c == '-' || c == '+'))
*w++ = c;
else if (!got_e && tolower(c) == 'e')
{
*w++ = 'e';
got_e = got_dot = 1;
}
else if (c == decimal && !got_dot)
{
*w++ = c;
got_dot = 1;
}
else
break;
if (width > 0)
--width;
} while (inchar() != EOF && width != 0);
if (w == work)
conv_error();
if (w[-1] == '-' || w[-1] == '+' || w[-1] == 'e')
conv_error();
#ifndef MIB_HACKS
/* Convert the number. */
*w = '\0';
fp_num = strtod(work, &w);
if (w == work)
conv_error();
if (do_assign)
{
if (is_long_double)
*va_arg(arg, LONG_DOUBLE *) = fp_num;
else if (is_long)
*va_arg(arg, double *) = (double) fp_num;
else
*va_arg(arg, float *) = (float) fp_num;
++done;
}
break;
#endif /* MIB_HACKS */
case '[': /* Character class. */
STRING_ARG;
if (c == EOF)
input_error();
if (*f == '^')
{
++f;
not_in = 1;
}
else
not_in = 0;
while ((fc = *f++) != '\0' && fc != ']')
{
if (fc == '-' && *f != '\0' && *f != ']' &&
w > work && w[-1] <= *f)
/* Add all characters from the one before the '-'
up to (but not including) the next format char. */
for (fc = w[-1] + 1; fc < *f; ++fc)
*w++ = fc;
else
/* Add the character to the list. */
*w++ = fc;
}
if (fc == '\0')
conv_error();
*w = '\0';
unum = read_in;
do
{
if ((strchr (work, c) == NULL) != not_in)
break;
STRING_ADD_CHAR (c);
if (width > 0)
--width;
} while (inchar () != EOF && width != 0);
if (read_in == unum)
conv_error ();
if (do_assign)
{
*str = '\0';
++done;
}
break;
case 'p': /* Generic pointer. */
base = 16;
/* A PTR must be the same size as a `long int'. */
is_long = 1;
goto number;
}
}
conv_error();
}

1
Tools/gdomap.c
View file

@ -248,7 +248,6 @@ static char ebuf[2048];
#ifdef HAVE_SYSLOG
static int log_perror = 0;
static int log_priority;
static void