gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-26 10:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use (id <String>) instead of (char *) where appropriate.

Browse source 
([MemoryStream -writeLine:]): Remove method.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@768 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mccallum 1996-01-23 22:31:50 +00:00
parent 09745e3dc8
commit d960e869cf
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/MemoryStream.m
View file

@ -1,5 +1,5 @@
/* Implementation of GNU Objective C memory stream /* Implementation of GNU Objective C memory stream
Copyright (C) 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
Written by: R. Andrew McCallum <mccallum@gnu.ai.mit.edu> Written by: R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
Date: July 1994 Date: July 1994
@ -144,14 +144,7 @@ static BOOL debug_memory_stream = NO;
return l; return l;
} }
- (void) writeLine: (const char *)l - (id <String>) readLine
{
[self writeBytes:l length:strlen(l)];
[self writeBytes:"\n" length:1];
}
/* This malloc's the buffer pointed to by the return value */
- (char *) readLine
{ {
char *nl = memchr(buffer+prefix+position, '\n', eofPosition-position); char *nl = memchr(buffer+prefix+position, '\n', eofPosition-position);
char *ret = NULL; char *ret = NULL;
@ -163,7 +156,7 @@ static BOOL debug_memory_stream = NO;
ret[len] = '\0'; ret[len] = '\0';
position += len+1; position += len+1;
} }
return ret; return [NSString stringWithCStringNoCopy:ret];
} }
/* Making these nested functions (which is what I'd like to do) is /* Making these nested functions (which is what I'd like to do) is
@ -193,7 +186,7 @@ void unchar_func(void *s, int c)
} }
#if HAVE_VSPRINTF #if HAVE_VSPRINTF
- (int) writeFormat: (const char *)format, ... - (int) writeFormat: (id <String>)format, ...
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -207,7 +200,7 @@ void unchar_func(void *s, int c)
[self setStreamBufferCapacity:size*2]; [self setStreamBufferCapacity:size*2];
va_start(ap, format); va_start(ap, format);
ret = vsprintf(buffer+prefix+position, format, ap); ret = vsprintf(buffer+prefix+position, [format cStringNoCopy], ap);
va_end(ap); va_end(ap);
position += ret; position += ret;
/* xxx Make sure we didn't overrun our buffer. /* xxx Make sure we didn't overrun our buffer.
@ -226,13 +219,14 @@ void unchar_func(void *s, int c)
} }
#endif #endif
- (int) readFormat: (const char *)format, ... - (int) readFormat: (id <String>)format, ...
{ {
int ret; int ret;
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
ret = objects_vscanf(self, inchar_func, unchar_func, format, ap); ret = objects_vscanf(self, inchar_func, unchar_func,
[format cStringNoCopy], ap);
va_end(ap); va_end(ap);
return ret; return ret;
} }