The spans do now contain the size of a span, no longer the end offset.

[cc65] / libsrc / common / _scanf.h

diff --git a/libsrc/common/_scanf.h b/libsrc/common/_scanf.h
index e477c37daafba9266b0918477201baeea74cf957..f8aad5be3fc1b5daf08371da5b190e8ab05a3f52 100644 (file)
--- a/libsrc/common/_scanf.h
+++ b/libsrc/common/_scanf.h
@@ -1,7 +1,7 @@
 /*
  * _scanf.h
  *
- * (C) Copyright 2001 Ullrich von Bassewitz (uz@cc65.org)
+ * (c) Copyright 2004, Ullrich von Bassewitz <uz@cc65.org>
  *
  */
 
@@ -16,27 +16,26 @@
  * return EOF if no more data is available.
  */
 typedef int __fastcall__ (*getfunc) (void* data);
+
+/* Type of the function that is called to put back unused data */
 typedef int __fastcall__ (*ungetfunc) (int c, void* data);
 
 
 
 /* Control structure passed to the low level worker function.
- * Beware: The low level functions will access the structure on the assembly
- * level, so check this when altering the structure.
+ * Beware: This structure is mirrored in the _scanf.inc assembler include
+ * file, so check this when altering the structure.
  */
 struct scanfdata {
-    getfunc                get;        /* Pointer to input routine */
-    ungetfunc       unget;      /* Pointer to pushback routine */
-    unsigned       ccount;     /* Number of chars read */
-
-    /* Fields used outside of _scanf */
-    void*           data;       /* Caller data */
+    getfunc    get;    /* Pointer to input routine */
+    ungetfunc  unget;  /* Pointer to pushback routine */
+    void*      data;   /* Pointer to struct. used outside of _scanf() */
 };
 
 
 
 /* Internal scanning routine */
-int _scanf (struct scanfdata* d, const char* format, va_list ap);
+int __fastcall__ _scanf (const struct scanfdata* d, const char* format, va_list ap);
 
 
 
@@ -45,4 +44,3 @@ int _scanf (struct scanfdata* d, const char* format, va_list ap);
 
 
 
-