commit 87f4d699cdb57e629a06d70db6168f67deead22b
parent 1546fad5b24220652477502dcfbc5ace5ff843cb
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Sun, 6 Nov 2022 10:11:13 +0100
libc: Update parameter style in prototypes
Diffstat:
M | include/wchar.h | | | 118 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
M | include/wctype.h | | | 36 | ++++++++++++++++++------------------ |
2 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/include/wchar.h b/include/wchar.h
@@ -19,78 +19,78 @@ typedef int mbstate_t;
struct tm;
#ifdef _STDARG_H
-extern int vswscanf(const wchar_t * restrict s, const wchar_t * restrict format, va_list arg);
-extern int vwprintf(const wchar_t * restrict format, va_list arg);
-extern int vwscanf(const wchar_t * restrict format, va_list arg);
+extern int vswscanf(const wchar_t *restrict, const wchar_t *restrict, va_list);
+extern int vwprintf(const wchar_t *restrict, va_list);
+extern int vwscanf(const wchar_t *restrict format, va_list);
#endif
#ifdef _STDIO_H
-extern int fwprintf(FILE * restrict stream, const wchar_t * restrict format, ...);
-extern int fwscanf(FILE * restrict stream, const wchar_t * restrict format, ...);
+extern int fwprintf(FILE *restrict, const wchar_t *restrict, ...);
+extern int fwscanf(FILE *restrict, const wchar_t *restrict, ...);
#ifdef _STDARG_H
-extern int vfwprintf(FILE * restrict stream, const wchar_t * restrict format, va_list arg);
-extern int vfwscanf(FILE * restrict stream, const wchar_t * restrict format, va_list arg);
-extern int vswprintf(wchar_t * restrict s, size_t n, const wchar_t * restrict format, va_list arg);
+extern int vfwprintf(FILE *restrict, const wchar_t *restrict, va_list);
+extern int vfwscanf(FILE *restrict, const wchar_t *restrict, va_list);
+extern int vswprintf(wchar_t *restrict, size_t, const wchar_t *restrict, va_list);
#endif
-extern wint_t fgetwc(FILE *stream);
-extern wint_t fputwc(wchar_t c, FILE *stream);
-extern wint_t getwc(FILE *stream);
-extern wint_t putwc(wchar_t c, FILE *stream);
-extern int fwide(FILE *stream, int mode);
-extern wint_t ungetwc(wint_t c, FILE *stream);
-extern wchar_t *fgetws(wchar_t * restrict s, int n, FILE * restrict stream);
-extern int fputws(const wchar_t * restrict s, FILE * restrict stream);
+extern wint_t fgetwc(FILE *);
+extern wint_t fputwc(wchar_t c, FILE *);
+extern wint_t getwc(FILE *);
+extern wint_t putwc(wchar_t, FILE *);
+extern int fwide(FILE *, int);
+extern wint_t ungetwc(wint_t, FILE *);
+extern wchar_t *fgetws(wchar_t *restrict, int, FILE *restrict);
+extern int fputws(const wchar_t *restrict, FILE *restrict);
#endif
-extern int swprintf(wchar_t * restrict s, size_t n, const wchar_t * restrict format, ...);
-extern int swscanf(const wchar_t * restrict s, const wchar_t * restrict format, ...);
-extern int wprintf(const wchar_t * restrict format, ...);
-extern int wscanf(const wchar_t * restrict format, ...);
+extern int swprintf(wchar_t *restrict, size_t, const wchar_t *restrict, ...);
+extern int swscanf(const wchar_t *restrict, const wchar_t *restrict, ...);
+extern int wprintf(const wchar_t *restrict, ...);
+extern int wscanf(const wchar_t *restrict, ...);
extern wint_t getwchar(void);
-extern wint_t putwchar(wchar_t c);
+extern wint_t putwchar(wchar_t);
-extern double wcstod(const wchar_t * restrict nptr, wchar_t ** restrict endptr);
-extern float wcstof(const wchar_t * restrict nptr, wchar_t ** restrict endptr);
-extern long double wcstold(const wchar_t * restrict nptr, wchar_t ** restrict endptr);
+extern double wcstod(const wchar_t *restrict, wchar_t **restrict);
+extern float wcstof(const wchar_t *restrict, wchar_t **restrict);
+extern long double wcstold(const wchar_t *restrict, wchar_t **restrict);
-extern long int wcstol(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
-extern long long int wcstoll(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
-extern unsigned long int wcstoul(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
-extern unsigned long long int wcstoull(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
+extern long int wcstol(const wchar_t *restrict, wchar_t **restrict, int);
+extern long long int wcstoll(const wchar_t *restrict, wchar_t **restrict, int);
+extern unsigned long int wcstoul(const wchar_t *restrict, wchar_t **restrict, int);
+extern unsigned long long int wcstoull(const wchar_t *restrict, wchar_t **restrict, int);
-extern wchar_t *wcscpy(wchar_t * restrict s1, const wchar_t * restrict s2);
-extern wchar_t *wcsncpy(wchar_t * restrict s1, const wchar_t * restrict s2, size_t n);
+extern wchar_t *wcscpy(wchar_t *restrict, const wchar_t *restrict);
+extern wchar_t *wcsncpy(wchar_t *restrict, const wchar_t *restrict, size_t);
-extern wchar_t *wmemcpy(wchar_t * restrict s1, const wchar_t * restrict s2, size_t n);
-extern wchar_t *wmemmove(wchar_t *s1, const wchar_t *s2, size_t n);
-extern wchar_t *wcscat(wchar_t * restrict s1, const wchar_t * restrict s2);
-extern wchar_t *wcsncat(wchar_t * restrict s1, const wchar_t * restrict s2, size_t n);
-extern int wcscmp(const wchar_t *s1, const wchar_t *s2);
-extern int wcscoll(const wchar_t *s1, const wchar_t *s2);
-extern int wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n);
-extern size_t wcsxfrm(wchar_t * restrict s1, const wchar_t * restrict s2, size_t n);
-extern int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n);
-extern wchar_t *wcschr(const wchar_t *s, wchar_t c);
-extern size_t wcscspn(const wchar_t *s1, const wchar_t *s2);
-extern wchar_t *wcspbrk(const wchar_t *s1, const wchar_t *s2);
-extern wchar_t *wcsrchr(const wchar_t *s, wchar_t c);
-extern size_t wcsspn(const wchar_t *s1, const wchar_t *s2);
-extern wchar_t *wcsstr(const wchar_t *s1, const wchar_t *s2);
-extern wchar_t *wcstok(wchar_t * restrict s1, const wchar_t * restrict s2, wchar_t ** restrict ptr);
-extern wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n);
-extern size_t wcslen(const wchar_t *s);
-extern wchar_t *wmemset(wchar_t *s, wchar_t c, size_t n);
-extern size_t wcsftime(wchar_t * restrict s, size_t maxsize, const wchar_t * restrict format, const struct tm * restrict timeptr);
-extern wint_t btowc(int c);
-extern int wctob(wint_t c);
-extern int mbsinit(const mbstate_t *ps);
-extern size_t mbrlen(const char * restrict s, size_t n, mbstate_t * restrict ps);
-extern size_t mbrtowc(wchar_t * restrict pwc, const char * restrict s, size_t n, mbstate_t * restrict ps);
-extern size_t wcrtomb(char * restrict s, wchar_t wc, mbstate_t * restrict ps);
-extern size_t mbsrtowcs(wchar_t * restrict dst, const char ** restrict src, size_t len, mbstate_t * restrict ps);
-extern size_t wcsrtombs(char * restrict dst, const wchar_t ** restrict src, size_t len, mbstate_t * restrict ps);
-extern int wcwidth(wchar_t wc);
+extern wchar_t *wmemcpy(wchar_t *restrict, const wchar_t *restrict, size_t);
+extern wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t);
+extern wchar_t *wcscat(wchar_t *restrict, const wchar_t *restrict);
+extern wchar_t *wcsncat(wchar_t *restrict, const wchar_t *restrict, size_t);
+extern int wcscmp(const wchar_t *, const wchar_t *);
+extern int wcscoll(const wchar_t *, const wchar_t *);
+extern int wcsncmp(const wchar_t *, const wchar_t *, size_t);
+extern size_t wcsxfrm(wchar_t *restrict, const wchar_t *restrict, size_t);
+extern int wmemcmp(const wchar_t *, const wchar_t *, size_t);
+extern wchar_t *wcschr(const wchar_t *, wchar_t);
+extern size_t wcscspn(const wchar_t *, const wchar_t *);
+extern wchar_t *wcspbrk(const wchar_t *, const wchar_t *);
+extern wchar_t *wcsrchr(const wchar_t *, wchar_t);
+extern size_t wcsspn(const wchar_t *, const wchar_t *);
+extern wchar_t *wcsstr(const wchar_t *, const wchar_t *);
+extern wchar_t *wcstok(wchar_t *restrict, const wchar_t *restrict, wchar_t **restrict);
+extern wchar_t *wmemchr(const wchar_t *, wchar_t, size_t);
+extern size_t wcslen(const wchar_t *);
+extern wchar_t *wmemset(wchar_t *, wchar_t, size_t);
+extern size_t wcsftime(wchar_t *restrict, size_t, const wchar_t *restrict, const struct tm *restrict);
+extern wint_t btowc(int);
+extern int wctob(wint_t);
+extern int mbsinit(const mbstate_t *);
+extern size_t mbrlen(const char *restrict, size_t, mbstate_t *restrict);
+extern size_t mbrtowc(wchar_t *restrict, const char *restrict, size_t, mbstate_t *restrict);
+extern size_t wcrtomb(char *restrict, wchar_t, mbstate_t *restrict);
+extern size_t mbsrtowcs(wchar_t *restrict, const char **restrict, size_t, mbstate_t *restrict);
+extern size_t wcsrtombs(char *restrict, const wchar_t **restrict, size_t, mbstate_t *restrict);
+extern int wcwidth(wchar_t);
#endif
diff --git a/include/wctype.h b/include/wctype.h
@@ -9,23 +9,23 @@
typedef const int *wctrans_t;
typedef unsigned long wctype_t;
-extern int iswalnum(wint_t wc);
-extern int iswalpha(wint_t wc);
-extern int iswblank(wint_t wc);
-extern int iswcntrl(wint_t wc);
-extern int iswdigit(wint_t wc);
-extern int iswgraph(wint_t wc);
-extern int iswlower(wint_t wc);
-extern int iswprint(wint_t wc);
-extern int iswpunct(wint_t wc);
-extern int iswspace(wint_t wc);
-extern int iswupper(wint_t wc);
-extern int iswxdigit(wint_t wc);
-extern int iswctype(wint_t wc, wctype_t desc);
-extern wctype_t wctype(const char *property);
-extern wint_t towlower(wint_t wc);
-extern wint_t towupper(wint_t wc);
-extern wint_t towctrans(wint_t wc, wctrans_t desc);
-extern wctrans_t wctrans(const char *property);
+extern int iswalnum(wint_t);
+extern int iswalpha(wint_t);
+extern int iswblank(wint_t);
+extern int iswcntrl(wint_t);
+extern int iswdigit(wint_t);
+extern int iswgraph(wint_t);
+extern int iswlower(wint_t);
+extern int iswprint(wint_t);
+extern int iswpunct(wint_t);
+extern int iswspace(wint_t);
+extern int iswupper(wint_t);
+extern int iswxdigit(wint_t);
+extern int iswctype(wint_t, wctype_t);
+extern wctype_t wctype(const char *);
+extern wint_t towlower(wint_t);
+extern wint_t towupper(wint_t);
+extern wint_t towctrans(wint_t, wctrans_t);
+extern wctrans_t wctrans(const char *);
#endif