From e4c09a29efeb64696d45f856c032361ef80eeeeb Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Thu, 6 Feb 2020 13:32:50 +0100
Subject: [PATCH] Revert "scanf (proto)"

This reverts commit e0b3c3d81e46e9e4f90b58eb8b5a8d4c4f590dc7.
---
 include/lib/buf.h     |  4 ++--
 kaleid/libbuf/bscan.c | 26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/include/lib/buf.h b/include/lib/buf.h
index 8255d2b..72536b2 100644
--- a/include/lib/buf.h
+++ b/include/lib/buf.h
@@ -167,8 +167,8 @@ size_t      vbprintf(Buffer_t *, const char *, va_list);
 
 error_t     bgetc(Buffer_t *, uchar *);
 size_t      bread(Buffer_t *, uchar *, size_t);
-size_t      bscanf(Buffer_t *, const char *, ...);
-size_t      vbscanf(Buffer_t *, const char *, va_list);
+size_t      bscanf(Buffer_t *, size_t *, const char *, ...);
+size_t      vbscanf(Buffer_t *, size_t *, const char *, va_list);
 
 error_t     bemptybuf(Buffer_t *);
 error_t     bscrolldown(Buffer_t *);
diff --git a/kaleid/libbuf/bscan.c b/kaleid/libbuf/bscan.c
index f7b5c25..cb31ee8 100644
--- a/kaleid/libbuf/bscan.c
+++ b/kaleid/libbuf/bscan.c
@@ -21,7 +21,7 @@
 //  You should have received a copy of the GNU General Public License         //
 //  along with OS/K.  If not, see <https://www.gnu.org/licenses/>.            //
 //----------------------------------------------------------------------------//
-
+#if 0
 #include <lib/buf.h>
 
 //
@@ -43,7 +43,7 @@ size_t BScanFromBuf(Buffer_t *buf, const char *fmt, ...)
 
 size_t BScanFromBufV(Buffer_t *buf, const char *fmt, va_list ap)
 {
-    size_t sz;
+    size_t rc;
     
     ExAcquireLock(&buf->lock);
     sz = vbscanf(buf, fmt, ap);
@@ -70,14 +70,13 @@ size_t vbscanf(Buffer_t *buf, const char *fmt, va_list ap)
 
     size_t readcnt = 0;
     uchar ch = 0;
-    char *chptr;
 
     bool l, h;
 
     size_t width;
     bool ignore;    // '*' modifier, don't write to va_list for current mod
 
-    if (!buf || !fmt) { seterrno(EINVAL); return 0; }
+    if (!buf || !fmt) { seterrnp(EINVAL); return 0; }
     if (buf->flags & (BF_EOF|BF_ERR)) { seterrno(EENDF); return 0; }
     if (buf->state != BS_RDWR && buf->state != BS_WRONLY) {
         seterrno(EBADF);
@@ -85,7 +84,7 @@ size_t vbscanf(Buffer_t *buf, const char *fmt, va_list ap)
     }
 
     // Progress in format string
-    while (*fmt && !rc) {
+    for (*fmt && !rc) {
         
         // Skip all kinds of whitespaces
         if (isspace(*fmt)) {
@@ -155,6 +154,8 @@ size_t vbscanf(Buffer_t *buf, const char *fmt, va_list ap)
             fmt++;
         }
 
+        assert(!(width < 0)); 
+
         //
         // Extract length field
         //
@@ -166,7 +167,7 @@ size_t vbscanf(Buffer_t *buf, const char *fmt, va_list ap)
 
         else if (*fmt == 'h') {
             h = 1;
-            fmt++;
+            fmt++
         }
 
         //
@@ -182,17 +183,16 @@ size_t vbscanf(Buffer_t *buf, const char *fmt, va_list ap)
             for (; width; width--) {
                 rc = bgetc(buf, &ch);
                 if (!rc) break;
-                if (ignore) continue;
 
-                chptr = va_arg(ap, char *);
-                *chptr = (char)ch;
-                readcnt++;
+                char *chptr = va_arg(ap, char *);
+                 *chptr = (char)ch;
+                 readcnt++;
             }
         }
 
         // Decimal integer
         else if (*fmt == 'd') {
-            ;
+            
         }
     }
 
@@ -205,6 +205,10 @@ size_t vbscanf(Buffer_t *buf, const char *fmt, va_list ap)
 
 
 
+#endif
+
+
+