Big merge: thanks alex and greatlord. Not a complete merge but most

[reactos.git] / reactos / lib / string / sscanf.c

diff --git a/reactos/lib/string/sscanf.c b/reactos/lib/string/sscanf.c
index 39b28f2..3d45975 100644 (file)
--- a/reactos/lib/string/sscanf.c
+++ b/reactos/lib/string/sscanf.c
@@ -10,6 +10,7 @@
 /* helper function for *scanf.  Returns the value of character c in the
  * given base, or -1 if the given character is not a digit of the base.
  */
+#if 0
 static int char2digit(char c, int base) {
     if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0');
     if (base<=10) return -1;
@@ -17,21 +18,25 @@ static int char2digit(char c, int base) {
     if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10);
     return -1;
 }
+#endif
 
 /* vsscanf */
 #undef WIDE_SCANF
 #undef CONSOLE
 #define STRING 1
-#include "scanf.h"
+//#include "scanf.h"
 
 int sscanf(const char *str, const char *format, ...)
 {
-    va_list valist;
     int res;
+#if 0
+    va_list valist;
 
     va_start(valist, format);
     res = vsscanf(str, format, valist);
     va_end(valist);
+#endif
+
     return res;
 }