From 53017ca6791b116cba35275e7ea5c436ebfc2629 Mon Sep 17 00:00:00 2001 From: mccallum Date: Wed, 24 Jan 1996 14:03:19 +0000 Subject: [PATCH] (SIGNATURE_FORMAT_STRING): New macro. ([Coder -writeSignature]): Use it. ([Coder +readSignatureFromCStream:getClassname:formatVersion:]): Likewise, and receive (char*) instead of (char**). All callers changed. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@798 72102866-910b-0410-8b05-ffd578937521 --- Source/Coder.m | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Source/Coder.m b/Source/Coder.m index cdda0e5ef..5eaa6325e 100644 --- a/Source/Coder.m +++ b/Source/Coder.m @@ -130,22 +130,25 @@ my_object_is_class(id object) return DEFAULT_FORMAT_VERSION; } +#define SIGNATURE_FORMAT_STRING \ +@"GNU Objective C Class Library %s version %d\n" + - (void) writeSignature { /* Careful: the string should not contain newlines. */ - [[cstream stream] writeFormat: - @"GNU Objective C Class Library %s version %d\n", + [[cstream stream] writeFormat: SIGNATURE_FORMAT_STRING, object_get_class_name(self), format_version]; } + (void) readSignatureFromCStream: (id ) cs - getClassname: (char **) namePtr + getClassname: (char *) name formatVersion: (int*) version { int got; - got = [[cs stream] readFormat: @"GNU %a version %d\n", namePtr, version]; + got = [[cs stream] readFormat: SIGNATURE_FORMAT_STRING, + name, version]; if (got != 2) [NSException raise:CoderSignatureMalformedException format:@"Coder found a malformed signature"]; @@ -181,12 +184,12 @@ my_object_is_class(id object) + coderReadingFromStream: (id ) stream { id cs = [CStream cStreamReadingFromStream: stream]; - char *name; + char name[128]; /* Max classname length. */ int version; id new_coder; [self readSignatureFromCStream: cs - getClassname: &name + getClassname: name formatVersion: &version]; new_coder = [[objc_lookup_class(name) alloc]