diff options
| -rw-r--r-- | include/compat.h | 18 | ||||
| -rw-r--r-- | lib/compat/w32_stdio.c | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/include/compat.h b/include/compat.h index 4810acb..6b4d83d 100644 --- a/include/compat.h +++ b/include/compat.h @@ -232,17 +232,17 @@ int fnmatch(const char *, const char *, int); #if defined(_WIN32) || defined(__WINDOWS__) extern int sqfs_tools_main(int argc, char **argv); -int stfs_tools_fputc(int c, FILE *strm); -int stfs_tools_fputs(const char *str, FILE *strm); -int stfs_tools_printf(const char *fmt, ...) PRINTF_ATTRIB(1, 2); -int stfs_tools_fprintf(FILE *strm, const char *fmt, ...) PRINTF_ATTRIB(2, 3); +int sqfs_tools_fputc(int c, FILE *strm); +int sqfs_tools_fputs(const char *str, FILE *strm); +int sqfs_tools_printf(const char *fmt, ...) PRINTF_ATTRIB(1, 2); +int sqfs_tools_fprintf(FILE *strm, const char *fmt, ...) PRINTF_ATTRIB(2, 3); #define main sqfs_tools_main -#define printf stfs_tools_printf -#define fprintf stfs_tools_fprintf -#define fputs stfs_tools_fputs -#define fputc stfs_tools_fputc -#define putc stfs_tools_fputc +#define printf sqfs_tools_printf +#define fprintf sqfs_tools_fprintf +#define fputs sqfs_tools_fputs +#define fputc sqfs_tools_fputc +#define putc sqfs_tools_fputc #endif #ifndef HAVE_STRCHRNUL diff --git a/lib/compat/w32_stdio.c b/lib/compat/w32_stdio.c index 3124899..c7f68d0 100644 --- a/lib/compat/w32_stdio.c +++ b/lib/compat/w32_stdio.c @@ -38,7 +38,7 @@ static BOOL isatty(HANDLE hnd) return (GetFileType(hnd) == FILE_TYPE_CHAR); } -int stfs_tools_fputs(const char *str, FILE *strm) +int sqfs_tools_fputs(const char *str, FILE *strm) { DWORD length; WCHAR *wstr; @@ -65,14 +65,14 @@ int stfs_tools_fputs(const char *str, FILE *strm) return ret; } -int stfs_tools_fputc(int c, FILE *strm) +int sqfs_tools_fputc(int c, FILE *strm) { char str[2]; str[0] = c; str[1] = '\0'; - return stfs_tools_fputs(str, strm); + return sqfs_tools_fputs(str, strm); } static int sqfs_printf_common(FILE *out, const char *fmt, va_list ap) @@ -94,14 +94,14 @@ static int sqfs_printf_common(FILE *out, const char *fmt, va_list ap) return -1; } - if (stfs_tools_fputs(str, out) == EOF) + if (sqfs_tools_fputs(str, out) == EOF) ret = -1; free(str); return ret; } -int stfs_tools_printf(const char *fmt, ...) +int sqfs_tools_printf(const char *fmt, ...) { va_list ap; int ret; @@ -112,7 +112,7 @@ int stfs_tools_printf(const char *fmt, ...) return ret; } -int stfs_tools_fprintf(FILE *strm, const char *fmt, ...) +int sqfs_tools_fprintf(FILE *strm, const char *fmt, ...) { va_list ap; int ret; |