From 43fd535a9d843e17b8c2c413af86465db459e481 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 11 Nov 1999 13:40:52 +0000 Subject: [PATCH] Revert last bugfix 'cos it broke DO git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@5156 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 ++++++++ Source/o_vscanf.c | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 235291c06..5e8e8c870 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Nov 7 14:04:00 1999 Richard Frith-Macdonald + + * Source/o_vscanf.c Reverted to earlier version - the last fix was + causing distributed objects to fail! I don't know why, but DO seems + more important than the bugfix - so, pending a rewrite of DO + encoding/decoding to remove the dependency on the old stream code, + we need to leave this as it is. + 1999-11-09 Adam Fedor * Source/o_vscanf.c (o_vscanf): Don't count '\n' as whitespace. diff --git a/Source/o_vscanf.c b/Source/o_vscanf.c index 79f90299d..0c8943c7f 100644 --- a/Source/o_vscanf.c +++ b/Source/o_vscanf.c @@ -181,12 +181,10 @@ o_vscanf (void *stream, if (isspace(fc)) { /* Whitespace characters match any amount of whitespace. */ - while (isspace (c) && c != '\n') + while (isspace (c)) inchar (); continue; } - else if (c == fc && *f == '\0') - continue; else if (c == fc) (void) inchar(); else