Completed _scanf.c, added vsscanf.c, rewrote sscanf.c.
Added an assembler include _file.inc and changed asm code that uses struct FILE to be independent of its size. Fixed return codes in several files to use EOF instead of -1. git-svn-id: svn://svn.cc65.org/cc65/trunk@1205 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
/*
|
||||
* Ullrich von Bassewitz, 11.08.1998
|
||||
* fgetc.c
|
||||
*
|
||||
* (C) Copyright 1998, 2002 Ullrich von Bassewitz (uz@cc65.org)
|
||||
*
|
||||
* int fgetc (FILE* f);
|
||||
*/
|
||||
|
||||
|
||||
@@ -13,13 +14,19 @@
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
int fgetc (FILE* f)
|
||||
{
|
||||
char c;
|
||||
unsigned char c;
|
||||
|
||||
/* 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) {
|
||||
return -1;
|
||||
return EOF;
|
||||
}
|
||||
|
||||
/* Read the byte */
|
||||
@@ -28,16 +35,16 @@ int fgetc (FILE* f)
|
||||
case -1:
|
||||
/* Error */
|
||||
f->f_flags |= _FERROR;
|
||||
return -1;
|
||||
return EOF;
|
||||
|
||||
case 0:
|
||||
/* EOF */
|
||||
f->f_flags |= _FEOF;
|
||||
return -1;
|
||||
return EOF;
|
||||
|
||||
default:
|
||||
/* Char read */
|
||||
return ((int) c) & 0xFF;
|
||||
return c;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user