[pure-lang-svn] SF.net SVN: pure-lang: [119] pure/trunk/runtime.cc

[<ag...@us...>]

Revision: 119
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=119&view=rev
Author:   agraef
Date:     2008-05-24 03:23:49 -0700 (Sat, 24 May 2008)

Log Message:
-----------
Bugfixes in pure_sscanf.

Modified Paths:
--------------
    pure/trunk/runtime.cc

Modified: pure/trunk/runtime.cc
===================================================================
--- pure/trunk/runtime.cc	2008-05-24 05:29:06 UTC (rev 118)
+++ pure/trunk/runtime.cc	2008-05-24 10:23:49 UTC (rev 119)
@@ -1783,7 +1783,7 @@
 extern "C"
 int pure_sscanf(const char *buf, const char *format)
 {
-  int count, res = sscanf(buf, myformat(format), &count);
+  int count = -1, res = sscanf(buf, myformat(format), &count);
   return (res >= 0)?count:-1;
 }
 
@@ -1793,28 +1793,28 @@
   // wrap this up in case int on the target platform is not 32 bit
   int count, y, res = sscanf(buf, myformat(format), &y, &count);
   *x = y;
-  return (res > 0)?count:-1;
+  return (res >= 0)?count:-1;
 }
 
 extern "C"
 int pure_sscanf_double(const char *buf, const char *format, double *x)
 {
-  int count, res = sscanf(buf, myformat(format), x, &count);
-  return (res > 0)?count:-1;
+  int count = -1, res = sscanf(buf, myformat(format), x, &count);
+  return (res >= 0)?count:-1;
 }
 
 extern "C"
 int pure_sscanf_string(const char *buf, const char *format, char *x)
 {
-  int count, res = sscanf(buf, myformat(format), x, &count);
-  return (res > 0)?count:-1;
+  int count = -1, res = sscanf(buf, myformat(format), x, &count);
+  return (res >= 0)?count:-1;
 }
 
 extern "C"
 int pure_sscanf_pointer(const char *buf, const char *format, void **x)
 {
-  int count, res = sscanf(buf, myformat(format), x, &count);
-  return (res > 0)?count:-1;
+  int count = -1, res = sscanf(buf, myformat(format), x, &count);
+  return (res >= 0)?count:-1;
 }
 
 #include <fnmatch.h>


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