nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add attribute format to standard library headers.

This commit is contained in:
Jonas 'Sortie' Termansen 2014-07-22 15:22:05 +02:00
parent a298cdde18
commit 771dc573ee
2 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libc/include/error.h
View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011. Copyright(C) Jonas 'Sortie' Termansen 2011, 2014.
This file is part of the Sortix C Library. This file is part of the Sortix C Library.
@ -29,9 +29,11 @@
__BEGIN_DECLS __BEGIN_DECLS
void gnu_error(int status, int errnum, const char* format, ...); void gnu_error(int status, int errnum, const char* format, ...)
__attribute__((__format__(__printf__, 3, 4)));
#if __SORTIX_STDLIB_REDIRECTS #if __SORTIX_STDLIB_REDIRECTS
void error(int status, int errnum, const char* format, ...) __asm__ ("gnu_error"); void error(int status, int errnum, const char* format, ...) __asm__ ("gnu_error")
__attribute__((__format__(__printf__, 3, 4)));
#endif #endif
__END_DECLS __END_DECLS

74
libc/include/stdio.h
View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014.
This file is part of the Sortix C Library. This file is part of the Sortix C Library.
@ -98,10 +98,12 @@ extern FILE* stderr;
#define stdout stdout #define stdout stdout
#define stderr stderr #define stderr stderr
int asprintf(char** __restrict, const char* __restrict, ...); int asprintf(char** __restrict, const char* __restrict, ...)
__attribute__((__format__ (printf, 2, 3)));
void clearerr(FILE* stream); void clearerr(FILE* stream);
void clearerr_unlocked(FILE* stream); void clearerr_unlocked(FILE* stream);
int dprintf(int fildes, const char* __restrict format, ...); int dprintf(int fildes, const char* __restrict format, ...)
__attribute__((__format__ (printf, 2, 3)));
int fclose(FILE* stream); int fclose(FILE* stream);
FILE* fdopen(int fildes, const char* mode); FILE* fdopen(int fildes, const char* mode);
int feof(FILE* stream); int feof(FILE* stream);
@ -119,8 +121,10 @@ char* fgets(char* __restrict s, int n, FILE* __restrict stream);
char* fgets_unlocked(char* __restrict, int, FILE* __restrict); char* fgets_unlocked(char* __restrict, int, FILE* __restrict);
void flockfile(FILE* file); void flockfile(FILE* file);
FILE* fopen(const char* __restrict filename, const char* __restrict mode); FILE* fopen(const char* __restrict filename, const char* __restrict mode);
int fprintf(FILE* __restrict stream, const char* __restrict format, ...); int fprintf(FILE* __restrict stream, const char* __restrict format, ...)
int fprintf_unlocked(FILE* __restrict stream, const char* __restrict format, ...); __attribute__((__format__ (printf, 2, 3)));
int fprintf_unlocked(FILE* __restrict stream, const char* __restrict format, ...)
__attribute__((__format__ (printf, 2, 3)));
int fputc(int c, FILE* stream); int fputc(int c, FILE* stream);
int fputc_unlocked(int c, FILE* stream); int fputc_unlocked(int c, FILE* stream);
int fputs(const char* __restrict, FILE* __restrict stream); int fputs(const char* __restrict, FILE* __restrict stream);
@ -128,8 +132,10 @@ int fputs_unlocked(const char* __restrict, FILE* __restrict stream);
size_t fread(void* __restrict ptr, size_t size, size_t nitems, FILE* __restrict stream); size_t fread(void* __restrict ptr, size_t size, size_t nitems, FILE* __restrict stream);
size_t fread_unlocked(void* __restrict ptr, size_t size, size_t nitems, FILE* __restrict stream); size_t fread_unlocked(void* __restrict ptr, size_t size, size_t nitems, FILE* __restrict stream);
FILE* freopen(const char* __restrict filename, const char *__restrict mode, FILE* __restrict stream); FILE* freopen(const char* __restrict filename, const char *__restrict mode, FILE* __restrict stream);
int fscanf(FILE* __restrict stream, const char* __restrict format, ... ); int fscanf(FILE* __restrict stream, const char* __restrict format, ... )
int fscanf_unlocked(FILE* __restrict stream, const char* __restrict format, ... ); __attribute__((__format__ (scanf, 2, 3)));
int fscanf_unlocked(FILE* __restrict stream, const char* __restrict format, ... )
__attribute__((__format__ (scanf, 2, 3)));
int fseek(FILE* stream, long offset, int whence); int fseek(FILE* stream, long offset, int whence);
int fseeko(FILE* stream, off_t offset, int whence); int fseeko(FILE* stream, off_t offset, int whence);
int fseeko_unlocked(FILE* stream, off_t offset, int whence); int fseeko_unlocked(FILE* stream, off_t offset, int whence);
@ -150,7 +156,8 @@ ssize_t getline(char** __restrict lineptr, size_t* __restrict n, FILE* __restric
int pclose(FILE* steam); int pclose(FILE* steam);
void perror(const char* s); void perror(const char* s);
FILE* popen(const char* command, const char* mode); FILE* popen(const char* command, const char* mode);
int printf(const char* __restrict format, ...); int printf(const char* __restrict format, ...)
__attribute__((__format__ (printf, 1, 2)));
int putc(int c, FILE* stream); int putc(int c, FILE* stream);
int putc_unlocked(int c, FILE* stream); int putc_unlocked(int c, FILE* stream);
int putchar(int c); int putchar(int c);
@ -161,30 +168,45 @@ int remove(const char* path);
int renameat(int oldfd, const char* oldname, int newfd, const char* newname); int renameat(int oldfd, const char* oldname, int newfd, const char* newname);
int rename(const char* oldname, const char* newname); int rename(const char* oldname, const char* newname);
void rewind(FILE* stream); void rewind(FILE* stream);
int snprintf(char* __restrict s, size_t n, const char* __restrict format, ...); int snprintf(char* __restrict s, size_t n, const char* __restrict format, ...)
__attribute__((__format__ (printf, 3, 4)));
void setbuf(FILE* __restrict stream, char* __restrict buf); void setbuf(FILE* __restrict stream, char* __restrict buf);
int setvbuf(FILE* __restrict stream, char* __restrict buf, int type, size_t size); int setvbuf(FILE* __restrict stream, char* __restrict buf, int type, size_t size);
int setvbuf_unlocked(FILE* __restrict stream, char* __restrict buf, int type, size_t size); int setvbuf_unlocked(FILE* __restrict stream, char* __restrict buf, int type, size_t size);
char* sortix_gets(void); char* sortix_gets(void);
int sortix_puts(const char* str); int sortix_puts(const char* str);
int sprintf(char* __restrict s, const char* __restrict format, ...); int sprintf(char* __restrict s, const char* __restrict format, ...)
int scanf(const char* __restrict format, ...); __attribute__((__format__ (printf, 2, 3)));
int sscanf(const char* __restrict s, const char* __restrict format, ...); int scanf(const char* __restrict format, ...)
__attribute__((__format__ (scanf, 1, 2)));
int sscanf(const char* __restrict s, const char* __restrict format, ...)
__attribute__((__format__ (scanf, 2, 3)));
FILE* tmpfile(void); FILE* tmpfile(void);
char* tmpnam(char* s); char* tmpnam(char* s);
int ungetc(int c, FILE* stream); int ungetc(int c, FILE* stream);
int ungetc_unlocked(int c, FILE* stream); int ungetc_unlocked(int c, FILE* stream);
int vasprintf(char** __restrict, const char* __restrict, __gnuc_va_list); int vasprintf(char** __restrict, const char* __restrict, __gnuc_va_list)
int vdprintf(int fildes, const char* __restrict format, __gnuc_va_list ap); __attribute__((__format__ (printf, 2, 0)));
int vfprintf(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list ap); int vdprintf(int fildes, const char* __restrict format, __gnuc_va_list ap)
int vfprintf_unlocked(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list ap); __attribute__((__format__ (printf, 2, 0)));
int vfscanf(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list arg); int vfprintf(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list ap)
int vfscanf_unlocked(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list arg); __attribute__((__format__ (printf, 2, 0)));
int vprintf(const char* __restrict format, __gnuc_va_list ap); int vfprintf_unlocked(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list ap)
int vscanf(const char* __restrict format, __gnuc_va_list arg); __attribute__((__format__ (printf, 2, 0)));
int vsnprintf(char* __restrict, size_t, const char* __restrict, __gnuc_va_list); int vfscanf(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list arg)
int vsprintf(char* __restrict s, const char* __restrict format, __gnuc_va_list ap); __attribute__((__format__ (scanf, 2, 0)));
int vsscanf(const char* __restrict s, const char* __restrict format, __gnuc_va_list arg); int vfscanf_unlocked(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list arg)
__attribute__((__format__ (scanf, 2, 0)));
int vprintf(const char* __restrict format, __gnuc_va_list ap)
__attribute__((__format__ (printf, 1, 0)));
int vscanf(const char* __restrict format, __gnuc_va_list arg)
__attribute__((__format__ (scanf, 1, 0)));
int vsnprintf(char* __restrict, size_t, const char* __restrict, __gnuc_va_list)
__attribute__((__format__ (printf, 3, 0)));
int vsprintf(char* __restrict s, const char* __restrict format, __gnuc_va_list ap)
__attribute__((__format__ (printf, 2, 0)));
int vsscanf(const char* __restrict s, const char* __restrict format, __gnuc_va_list arg)
__attribute__((__format__ (scanf, 2, 0)));
/* TODO: These are not implemented in sortix libc yet. */ /* TODO: These are not implemented in sortix libc yet. */
#if 0 #if 0
@ -236,12 +258,14 @@ int fpipe(FILE* pipes[2]);
size_t vprintf_callback(size_t (*callback)(void*, const char*, size_t), size_t vprintf_callback(size_t (*callback)(void*, const char*, size_t),
void* user, void* user,
const char* __restrict format, const char* __restrict format,
__gnuc_va_list ap); __gnuc_va_list ap)
__attribute__((__format__ (printf, 3, 0)));
int vscanf_callback(void* fp, int vscanf_callback(void* fp,
int (*fgetc)(void*), int (*fgetc)(void*),
int (*ungetc)(int, void*), int (*ungetc)(int, void*),
const char* __restrict format, const char* __restrict format,
__gnuc_va_list ap); __gnuc_va_list ap)
__attribute__((__format__ (scanf, 4, 0)));
#endif #endif
__END_DECLS __END_DECLS