[brlcad-commits] SF.net SVN: brlcad:[49177] brlcad/trunk/src/libbu/sscanf.c

[<n_...@us...>]

Revision: 49177
          http://brlcad.svn.sourceforge.net/brlcad/?rev=49177&view=rev
Author:   n_reed
Date:     2012-02-01 21:49:11 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
still need to match literal sequence even if it ends with null

Modified Paths:
--------------
    brlcad/trunk/src/libbu/sscanf.c

Modified: brlcad/trunk/src/libbu/sscanf.c
===================================================================
--- brlcad/trunk/src/libbu/sscanf.c	2012-02-01 21:35:41 UTC (rev 49176)
+++ brlcad/trunk/src/libbu/sscanf.c	2012-02-01 21:49:11 UTC (rev 49177)
@@ -220,12 +220,6 @@
     BU_ASSERT(src != NULL);
     BU_ASSERT(fmt != NULL);
 
-    /* XXX if fmt is only whitespace, then we should immediately return 0.  */
-
-    /* if src is only whitespace and fmt is not only whitespace, then
-     * then we should immediately return EOF.
-     */
-
     numFieldsAssigned = 0;
     numCharsConsumed = 0;
     partConsumed = 0;
@@ -276,14 +270,7 @@
 	    /* Must have found literal sequence. Find where it ends. */
 	    while (1) {
 		c = *fmt;
-		if (c == '\0') {
-		    /* Literal sequence terminated by EOI. No point in scanning
-		     * src for the sequence.
-		     */
-		    goto exit;
-		}
-		if (isspace(c) || c == '%') {
-		    /* found start of next word */
+		if (c == '\0' || isspace(c) || c == '%') {
 		    break;
 		}
 		++fmt;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.