Fixed the return code of fgetpos and ftell.

Made lots of functions __fastcall__.

git-svn-id: svn://svn.cc65.org/cc65/trunk@2615 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/common/fdopen.c b/libsrc/common/fdopen.c
index 19c94a977abd8eb5ceda4b7284ab207d137f47b0..6f0ea365a02e039d191c24c01fecfcc56561c6e1 100644 (file)
--- a/libsrc/common/fdopen.c
+++ b/libsrc/common/fdopen.c
@@ -13,7 +13,13 @@
 
 
 
-FILE* fdopen (int handle, const char* /*mode*/)
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+FILE* __fastcall__ fdopen (int handle, const char* /*mode*/)
 {
     FILE* f;
 

diff --git a/libsrc/common/fgetc.c b/libsrc/common/fgetc.c
index c7d30d4bcbd087ab62ac3feb553f1ace4a1f9648..c84d8e662857419117e379e2776950d363fac702 100644 (file)
--- a/libsrc/common/fgetc.c
+++ b/libsrc/common/fgetc.c
@@ -20,7 +20,7 @@
 
 
 
-int fgetc (FILE* f)
+int __fastcall__ fgetc (FILE* f)
 {
     unsigned char c;
 

diff --git a/libsrc/common/fgetpos.c b/libsrc/common/fgetpos.c
index ae4b8c1708f821ce4f18d1da2337263db63b561c..e3851f873444949f0461f76d3f5aa71c0e916f18 100644 (file)
--- a/libsrc/common/fgetpos.c
+++ b/libsrc/common/fgetpos.c
@@ -5,15 +5,23 @@
  */
 
 
+
 #include <stdio.h>
 
 
-int fgetpos(FILE* f, fpos_t *pos)
+
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+int __fastcall__ fgetpos (FILE* f, fpos_t* pos)
 {
     *pos = ftell (f);
 
     if (*pos != -1)
         return 0;
-    return 1;
+    return -1;
 }
 

diff --git a/libsrc/common/fgets.c b/libsrc/common/fgets.c
index 18fc29a6c82d8d3cebc25b5940126c025baaa716..ebfeb08662abe590c9f729229f6f4f13dd126ab6 100644 (file)
--- a/libsrc/common/fgets.c
+++ b/libsrc/common/fgets.c
@@ -12,7 +12,13 @@
 
 
 
-char* fgets (char* s, unsigned size, FILE* f)
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+char* __fastcall__ fgets (char* s, unsigned size, FILE* f)
 {
     int i = 0;
     int c;

diff --git a/libsrc/common/fputc.c b/libsrc/common/fputc.c
index 2bb01a432a4cd496b7c5df1a3cb4db07b4fdbf36..ef676a864186e6c150882d3af510054b35116c09 100644 (file)
--- a/libsrc/common/fputc.c
+++ b/libsrc/common/fputc.c
@@ -12,7 +12,13 @@
 
 
 
-int fputc (int c, FILE* f)
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+int __fastcall__ fputc (int c, FILE* f)
 {
     /* Check if the file is open or if there is an error condition */
     if ((f->f_flags & _FOPEN) == 0 || (f->f_flags & (_FERROR | _FEOF)) != 0) {

diff --git a/libsrc/common/freopen.c b/libsrc/common/freopen.c
index da86b2685886e1e6469e5958204144ebfb783bfb..b811badd8bca08e43ddb0cb13df56b5ffe72644f 100644 (file)
--- a/libsrc/common/freopen.c
+++ b/libsrc/common/freopen.c
@@ -13,7 +13,13 @@
 
 
 
-FILE* freopen (const char* name, const char* mode, FILE* f)
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+FILE* __fastcall__ freopen (const char* name, const char* mode, FILE* f)
 {
     /* Check if the file is open, if so, close it */
     if ((f->f_flags & _FOPEN) == 0) {

diff --git a/libsrc/common/fseek.c b/libsrc/common/fseek.c
index 62d435e02737e6818dd3b6df3b58699518656422..3ad4b1f8536ff4da8b630ba9b23042ef4aaa8762 100644 (file)
--- a/libsrc/common/fseek.c
+++ b/libsrc/common/fseek.c
@@ -5,24 +5,32 @@
  */
 
 
+
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include "_file.h"
 
+                
+
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
 
-int fseek(FILE* f, long offset, int whence)
+int __fastcall__ fseek (FILE* f, long offset, int whence)
 {
     long res;
 
     /* Is the file open? */
     if ((f->f_flags & _FOPEN) == 0) {
         _errno = EINVAL;                /* File not open */
-        return 1;
+        return -1;
     }
 
     res = lseek(f->f_fd, offset, whence);
-    if (res == -1L) return 1;
+    if (res == -1L) return -1;
     return 0;
 }
 

diff --git a/libsrc/common/fsetpos.c b/libsrc/common/fsetpos.c
index a04185a4274242754cbbf735fdd5cc60dc3b6a97..6194a109c6fee6e676a3edab4dc3df4ded08f14a 100644 (file)
--- a/libsrc/common/fsetpos.c
+++ b/libsrc/common/fsetpos.c
@@ -5,11 +5,20 @@
  */
 
 
+
 #include <stdio.h>
 
 
-int fsetpos(FILE* f, const fpos_t *pos)
+
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+int __fastcall__ fsetpos (FILE* f, const fpos_t *pos)
 {
     return fseek (f, (fpos_t)*pos, SEEK_SET);
 }
 
+    

diff --git a/libsrc/common/ftell.c b/libsrc/common/ftell.c
index 317e3ee032a22e90261ec6009ad04d7bc6849ee5..5af340929aec672e19e0f07eba0a5fb9cfad9429 100644 (file)
--- a/libsrc/common/ftell.c
+++ b/libsrc/common/ftell.c
@@ -5,13 +5,21 @@
  */
 
 
+
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include "_file.h"
 
 
-long ftell(FILE* f)
+
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+long __fastcall__ ftell (FILE* f)
 {
     long pos;
 

diff --git a/libsrc/common/getchar.c b/libsrc/common/getchar.c
index a058ab02235655433a4b17a8fc8a01116ca8c2c0..a37930df87a4934220329918252735ad3faca291 100644 (file)
--- a/libsrc/common/getchar.c
+++ b/libsrc/common/getchar.c
@@ -7,13 +7,17 @@
 
 
 #include <stdio.h>
+#undef getchar         /* This is usually declared as a macro */
 
-/* This is usually declared as a macro */
-#undef getchar
 
 
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
 
-int getchar (void)
+
+
+int __fastcall__ getchar (void)
 {
     return fgetc (stdin);
 }

diff --git a/libsrc/common/gets.c b/libsrc/common/gets.c
index b9dd0017041e8cd37fb027672ff850cd373a3ac8..377e0ba537b4bf7055006cd62108088a7808a4a2 100644 (file)
--- a/libsrc/common/gets.c
+++ b/libsrc/common/gets.c
@@ -11,7 +11,13 @@
 
 
 
-char* gets (char* s)
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+char* __fastcall__ gets (char* s)
 {
     int c;
     int i = 0;
@@ -49,3 +55,4 @@ char* gets (char* s)
 
 
 
+                  

diff --git a/libsrc/common/putchar.c b/libsrc/common/putchar.c
index 95bee07d71a05f8e9c13e3e392553d21751abde7..a98341a59e01ea63011bee4233ae1985a20680e4 100644 (file)
--- a/libsrc/common/putchar.c
+++ b/libsrc/common/putchar.c
@@ -7,13 +7,17 @@
 
 
 #include <stdio.h>
+#undef putchar         /* This is usually declared as a macro */
 
-/* This is usually declared as a macro */
-#undef putchar
 
 
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
 
-int putchar (int c)
+
+
+int __fastcall__ putchar (int c)
 {
     return fputc (c, stdout);
 }

diff --git a/libsrc/common/puts.c b/libsrc/common/puts.c
index 18b2e9ab1cb03ecf944c7387a6053be820b2154b..85b8cc315d3149592ef239c54fd0586cc6ee792e 100644 (file)
--- a/libsrc/common/puts.c
+++ b/libsrc/common/puts.c
@@ -13,7 +13,13 @@
 
 
 
-int puts (const char* s)
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+int __fastcall__ puts (const char* s)
 {
     static char nl = '\n';
 

diff --git a/libsrc/common/rewind.c b/libsrc/common/rewind.c
index a4935b4a012c3317649a09782d4487c0d208162e..b6055ece534dc592ff51e36fea2e5f91398e5e79 100644 (file)
--- a/libsrc/common/rewind.c
+++ b/libsrc/common/rewind.c
@@ -5,12 +5,21 @@
  */
 
 
+
 #include <stdio.h>
 
 
-void rewind(FILE* f)
+
+/*****************************************************************************/
+/*                                          Code                                    */
+/*****************************************************************************/
+
+
+
+void __fastcall__ rewind (FILE* f)
 {
     fseek(f, 0L, SEEK_SET);
     clearerr(f);
 }
 
+                 

diff --git a/libsrc/common/vsscanf.c b/libsrc/common/vsscanf.c
index 7dc28dcbb346375b555120f45097eafe9a62e435..95fcf5e9bc53bf106aab2444b4890cde7ef9cfb1 100644 (file)
--- a/libsrc/common/vsscanf.c
+++ b/libsrc/common/vsscanf.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "_scanf.h"
-
+                
 
 
 /*****************************************************************************/
@@ -31,7 +31,7 @@ static char get (struct indesc* d)
 
 
 
-int vsscanf (const char* str, const char* format, va_list ap)
+int __fastcall__ vsscanf (const char* str, const char* format, va_list ap)
 /* Standard C function */
 {
     struct indesc id;