diff options
66 files changed, 121 insertions, 121 deletions
diff --git a/include/inttypes.h b/include/inttypes.h index 3fe6fcc..99841b8 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -48,8 +48,8 @@ __BEGIN_DECLS intmax_t imaxabs(intmax_t) __pure2; imaxdiv_t imaxdiv(intmax_t, intmax_t) __pure2; -intmax_t strtoimax(const char *__restrict, char **__restrict, int); -uintmax_t strtoumax(const char *__restrict, char **__restrict, int); +intmax_t strtoimax(const char * __restrict, char ** __restrict, int); +uintmax_t strtoumax(const char * __restrict, char ** __restrict, int); /* XXX: The following functions are missing the restrict type qualifier. */ intmax_t wcstoimax(const wchar_t *, wchar_t **, int); uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); diff --git a/include/search.h b/include/search.h index c899762..e89b0c4 100644 --- a/include/search.h +++ b/include/search.h @@ -44,7 +44,7 @@ __BEGIN_DECLS int hcreate(size_t); void hdestroy(void); ENTRY *hsearch(ENTRY, ACTION); -void *tdelete(const void *__restrict, void **__restrict, +void *tdelete(const void * __restrict, void ** __restrict, int (*)(const void *, const void *)); void *tfind(const void *, void **, int (*)(const void *, const void *)); void *tsearch(const void *, void **, int (*)(const void *, const void *)); diff --git a/include/stdio.h b/include/stdio.h index 724b0df..15623f8 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -221,7 +221,7 @@ int fgetc(FILE *); int fgetpos(FILE *, fpos_t *); char *fgets(char *, int, FILE *); FILE *fopen(const char *, const char *); -int fprintf(FILE *__restrict, const char *__restrict, ...); +int fprintf(FILE * __restrict, const char * __restrict, ...); int fputc(int, FILE *); int fputs(const char *, FILE *); size_t fread(void *, size_t, size_t, FILE *); @@ -235,7 +235,7 @@ int getc(FILE *); int getchar(void); char *gets(char *); void perror(const char *); -int printf(const char *__restrict, ...); +int printf(const char * __restrict, ...); int putc(int, FILE *); int putchar(int); int puts(const char *); @@ -243,23 +243,23 @@ int remove(const char *); int rename(const char *, const char *); void rewind(FILE *); int scanf(const char *, ...); -void setbuf(FILE *__restrict, char *__restrict); -int setvbuf(FILE *__restrict, char *__restrict, int, size_t); -int sprintf(char *__restrict, const char *__restrict, ...); +void setbuf(FILE * __restrict, char * __restrict); +int setvbuf(FILE * __restrict, char * __restrict, int, size_t); +int sprintf(char * __restrict, const char * __restrict, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); char *tmpnam(char *); int ungetc(int, FILE *); -int vfprintf(FILE *__restrict, const char *__restrict, +int vfprintf(FILE * __restrict, const char * __restrict, __va_list); -int vprintf(const char *__restrict, __va_list); -int vsprintf(char *__restrict, const char *__restrict, +int vprintf(const char * __restrict, __va_list); +int vsprintf(char * __restrict, const char * __restrict, __va_list); #if __ISO_C_VISIBLE >= 1999 -int snprintf(char *__restrict, size_t, const char *__restrict, +int snprintf(char * __restrict, size_t, const char * __restrict, ...) __printflike(3, 4); -int vsnprintf(char *__restrict, size_t, const char *__restrict, +int vsnprintf(char * __restrict, size_t, const char * __restrict, __va_list) __printflike(3, 0); #endif diff --git a/include/stdlib.h b/include/stdlib.h index 33cd6e4..1569f71 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -113,17 +113,17 @@ void qsort(void *, size_t, size_t, int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char *__restrict, char **__restrict); -long strtol(const char *__restrict, char **__restrict, int); +double strtod(const char * __restrict, char ** __restrict); +long strtol(const char * __restrict, char ** __restrict, int); unsigned long - strtoul(const char *__restrict, char **__restrict, int); + strtoul(const char * __restrict, char ** __restrict, int); int system(const char *); int mblen(const char *, size_t); -size_t mbstowcs(wchar_t *__restrict , const char *__restrict, size_t); +size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t); int wctomb(char *, wchar_t); -int mbtowc(wchar_t *__restrict, const char *__restrict, size_t); -size_t wcstombs(char *__restrict, const wchar_t *__restrict, size_t); +int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); +size_t wcstombs(char * __restrict, const wchar_t * __restrict, size_t); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) extern const char *_malloc_options; @@ -197,13 +197,13 @@ void srandomdev(void); #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ long long - strtoll(const char *__restrict, char **__restrict, int); + strtoll(const char * __restrict, char ** __restrict, int); #endif __int64_t strtoq(const char *, char **, int); #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ unsigned long long - strtoull(const char *__restrict, char **__restrict, int); + strtoull(const char * __restrict, char ** __restrict, int); #endif __uint64_t strtouq(const char *, char **, int); diff --git a/include/time.h b/include/time.h index 90accb8..c7ba4f0 100644 --- a/include/time.h +++ b/include/time.h @@ -121,8 +121,8 @@ double difftime(time_t, time_t); struct tm *gmtime(const time_t *); struct tm *localtime(const time_t *); time_t mktime(struct tm *); -size_t strftime(char *__restrict, size_t, const char *__restrict, - const struct tm *__restrict); +size_t strftime(char * __restrict, size_t, const char * __restrict, + const struct tm * __restrict); time_t time(time_t *); #if __POSIX_VISIBLE @@ -144,8 +144,8 @@ struct tm *localtime_r(const time_t *, struct tm *); #endif #if __XSI_VISIBLE -char *strptime(const char *__restrict, const char *__restrict, - struct tm *__restrict); +char *strptime(const char * __restrict, const char * __restrict, + struct tm * __restrict); #endif #if __BSD_VISIBLE diff --git a/include/unistd.h b/include/unistd.h index 8629305..b644ce2 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -190,7 +190,7 @@ int seteuid(uid_t); * course has been in BSD practically forever. */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 402 || __BSD_VISIBLE -int symlink(const char *__restrict, const char *__restrict); +int symlink(const char * __restrict, const char * __restrict); #endif /* X/Open System Interfaces */ @@ -210,7 +210,7 @@ ssize_t pwrite(int, const void *, size_t, off_t); int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void *__restrict, void *__restrict, ssize_t); */ +/* void swab(const void * __restrict, void * __restrict, ssize_t); */ void sync(void); unsigned int ualarm(unsigned int, unsigned int); int usleep(unsigned int); diff --git a/include/wchar.h b/include/wchar.h index bcbac9b..bfb2720 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -111,9 +111,9 @@ __BEGIN_DECLS wint_t btowc(int); wint_t fgetwc(FILE *); wchar_t * - fgetws(wchar_t *__restrict, int, FILE *__restrict); + fgetws(wchar_t * __restrict, int, FILE * __restrict); wint_t fputwc(wchar_t, FILE *); -int fputws(const wchar_t *__restrict, FILE *__restrict); +int fputws(const wchar_t * __restrict, FILE * __restrict); int fwide(FILE *, int); wint_t getwc(FILE *); wint_t getwchar(void); diff --git a/lib/libc/gen/statvfs.3 b/lib/libc/gen/statvfs.3 index e825790..d15b160 100644 --- a/lib/libc/gen/statvfs.3 +++ b/lib/libc/gen/statvfs.3 @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In sys/statvfs.h .Ft int -.Fn statvfs "const char *restrict path" "struct statvfs *restrict buf" +.Fn statvfs "const char * restrict path" "struct statvfs * restrict buf" .Ft int .Fn fstatvfs "int fd" "struct statvfs *buf" .Sh DESCRIPTION diff --git a/lib/libc/gen/statvfs.c b/lib/libc/gen/statvfs.c index 51727f1..fe9462b 100644 --- a/lib/libc/gen/statvfs.c +++ b/lib/libc/gen/statvfs.c @@ -70,7 +70,7 @@ fstatvfs(int fd, struct statvfs *result) } int -statvfs(const char *__restrict path, struct statvfs *__restrict result) +statvfs(const char * __restrict path, struct statvfs * __restrict result) { struct statfs sfs; int rv; diff --git a/lib/libc/locale/mbrlen.3 b/lib/libc/locale/mbrlen.3 index 0fcc227..0775b2f 100644 --- a/lib/libc/locale/mbrlen.3 +++ b/lib/libc/locale/mbrlen.3 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbrlen "const char *restrict s" "size_t n" "mbstate_t *restrict ps" +.Fn mbrlen "const char * restrict s" "size_t n" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn mbrlen diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c index 139aff3..a2ab65b 100644 --- a/lib/libc/locale/mbrlen.c +++ b/lib/libc/locale/mbrlen.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include <wchar.h> size_t -mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps __unused) +mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps __unused) { return (mbrtowc(NULL, s, n, NULL)); diff --git a/lib/libc/locale/mbrtowc.3 b/lib/libc/locale/mbrtowc.3 index bb0f1ac..435f146 100644 --- a/lib/libc/locale/mbrtowc.3 +++ b/lib/libc/locale/mbrtowc.3 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbrtowc "wchar_t *restrict pwc" "const char *restrict s" "size_t n" "mbstate_t *restrict ps" +.Fn mbrtowc "wchar_t * restrict pwc" "const char * restrict s" "size_t n" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn mbrtowc diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c index a1b960c..2a61115 100644 --- a/lib/libc/locale/mbrtowc.c +++ b/lib/libc/locale/mbrtowc.c @@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$"); #include <wchar.h> size_t -mbrtowc(wchar_t *__restrict pwc, const char *__restrict s, size_t n, - mbstate_t *__restrict ps __unused) +mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, + mbstate_t * __restrict ps __unused) { const char *e; rune_t r; diff --git a/lib/libc/locale/mbsrtowcs.3 b/lib/libc/locale/mbsrtowcs.3 index 3c38a46..79e9009 100644 --- a/lib/libc/locale/mbsrtowcs.3 +++ b/lib/libc/locale/mbsrtowcs.3 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbsrtowcs "wchar_t *restrict dst" "const char **restrict src" "size_t len" "mbstate_t *restrict ps" +.Fn mbsrtowcs "wchar_t * restrict dst" "const char ** restrict src" "size_t len" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn mbsrtowcs diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c index 25b6c17..3e7b3b8 100644 --- a/lib/libc/locale/mbsrtowcs.c +++ b/lib/libc/locale/mbsrtowcs.c @@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$"); #include <wchar.h> size_t -mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src, size_t len, - mbstate_t *__restrict ps __unused) +mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, size_t len, + mbstate_t * __restrict ps __unused) { const char *s; size_t nchr; diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c index f27f897..3657c83 100644 --- a/lib/libc/locale/mbstowcs.c +++ b/lib/libc/locale/mbstowcs.c @@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$"); size_t mbstowcs(pwcs, s, n) - wchar_t *__restrict pwcs; - const char *__restrict s; + wchar_t * __restrict pwcs; + const char * __restrict s; size_t n; { char const *e; diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c index 67b7b38..206a3a3 100644 --- a/lib/libc/locale/mbtowc.c +++ b/lib/libc/locale/mbtowc.c @@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$"); int mbtowc(pwc, s, n) - wchar_t *__restrict pwc; - const char *__restrict s; + wchar_t * __restrict pwc; + const char * __restrict s; size_t n; { char const *e; diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3 index 4c1c38e..a2abd40 100644 --- a/lib/libc/locale/multibyte.3 +++ b/lib/libc/locale/multibyte.3 @@ -52,11 +52,11 @@ .Ft int .Fn mblen "const char *mbchar" "size_t nbytes" .Ft size_t -.Fn mbstowcs "wchar_t *restrict wcstring" "const char *restrict mbstring" "size_t nwchars" +.Fn mbstowcs "wchar_t * restrict wcstring" "const char * restrict mbstring" "size_t nwchars" .Ft int -.Fn mbtowc "wchar_t *restrict wcharp" "const char *restrict mbchar" "size_t nbytes" +.Fn mbtowc "wchar_t * restrict wcharp" "const char * restrict mbchar" "size_t nbytes" .Ft size_t -.Fn wcstombs "char *restrict mbstring" "const wchar_t *restrict wcstring" "size_t nbytes" +.Fn wcstombs "char * restrict mbstring" "const wchar_t * restrict wcstring" "size_t nbytes" .Ft int .Fn wctomb "char *mbchar" "wchar_t wchar" .Sh DESCRIPTION diff --git a/lib/libc/locale/wcrtomb.3 b/lib/libc/locale/wcrtomb.3 index d8fb7f2..8614f62 100644 --- a/lib/libc/locale/wcrtomb.3 +++ b/lib/libc/locale/wcrtomb.3 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn wcrtomb "char *restrict s" "wchar_t wc" "mbstate_t *restrict ps" +.Fn wcrtomb "char * restrict s" "wchar_t wc" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn wcrtomb diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c index 8c8b2cd..116dce5 100644 --- a/lib/libc/locale/wcrtomb.c +++ b/lib/libc/locale/wcrtomb.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <wchar.h> size_t -wcrtomb(char *__restrict s, wchar_t wc, mbstate_t *__restrict ps __unused) +wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps __unused) { char *e; diff --git a/lib/libc/locale/wcsrtombs.3 b/lib/libc/locale/wcsrtombs.3 index f3e9ad0..f4ecf41 100644 --- a/lib/libc/locale/wcsrtombs.3 +++ b/lib/libc/locale/wcsrtombs.3 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn wcsrtombs "char *restrict dst" "const wchar_t **restrict src" "size_t len" "mbstate_t *restrict ps" +.Fn wcsrtombs "char * restrict dst" "const wchar_t ** restrict src" "size_t len" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn wcsrtombs diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c index ccda84e..ea3354b 100644 --- a/lib/libc/locale/wcsrtombs.c +++ b/lib/libc/locale/wcsrtombs.c @@ -34,8 +34,8 @@ __FBSDID("$FreeBSD$"); #include <wchar.h> size_t -wcsrtombs(char *__restrict dst, const wchar_t **__restrict src, size_t len, - mbstate_t *__restrict ps __unused) +wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t len, + mbstate_t * __restrict ps __unused) { char buf[MB_LEN_MAX]; const wchar_t *s; diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c index 208aac8..25652a8 100644 --- a/lib/libc/locale/wcstombs.c +++ b/lib/libc/locale/wcstombs.c @@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$"); size_t wcstombs(s, pwcs, n) - char *__restrict s; - const wchar_t *__restrict pwcs; + char * __restrict s; + const wchar_t * __restrict pwcs; size_t n; { char buf[MB_LEN_MAX]; diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3 index b5a898d..e480894 100644 --- a/lib/libc/net/inet.3 +++ b/lib/libc/net/inet.3 @@ -64,12 +64,12 @@ .Ft const char * .Fo inet_ntop .Fa "int af" -.Fa "const void *restrict src" -.Fa "char *restrict dst" +.Fa "const void * restrict src" +.Fa "char * restrict dst" .Fa "socklen_t size" .Fc .Ft int -.Fn inet_pton "int af" "const char *restrict src" "void *restrict dst" +.Fn inet_pton "int af" "const char * restrict src" "void * restrict dst" .Ft struct in_addr .Fn inet_makeaddr "in_addr_t net" "in_addr_t lna" .Ft in_addr_t diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c index 93e175c..d73a33c 100644 --- a/lib/libc/net/inet_ntop.c +++ b/lib/libc/net/inet_ntop.c @@ -47,7 +47,7 @@ static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size); * Paul Vixie, 1996. */ const char * -inet_ntop(int af, const void *__restrict src, char *__restrict dst, +inet_ntop(int af, const void * __restrict src, char * __restrict dst, socklen_t size) { switch (af) { diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c index b29e3e2..65f28cf 100644 --- a/lib/libc/net/inet_pton.c +++ b/lib/libc/net/inet_pton.c @@ -48,7 +48,7 @@ static int inet_pton6(const char *src, u_char *dst); * Paul Vixie, 1996. */ int -inet_pton(int af, const char *__restrict src, void *__restrict dst) +inet_pton(int af, const char * __restrict src, void * __restrict dst) { switch (af) { case AF_INET: diff --git a/lib/libc/stdio/fgetws.3 b/lib/libc/stdio/fgetws.3 index 5ccd4fe..ae737cf 100644 --- a/lib/libc/stdio/fgetws.3 +++ b/lib/libc/stdio/fgetws.3 @@ -49,7 +49,7 @@ .In stdio.h .In wchar.h .Ft "wchar_t *" -.Fn fgetws "wchar_t *restrict ws" "int n" "FILE *restrict fp" +.Fn fgetws "wchar_t * restrict ws" "int n" "FILE * restrict fp" .Sh DESCRIPTION The .Fn fgetws diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c index 2cfd4e3..9d456a1 100644 --- a/lib/libc/stdio/fgetws.c +++ b/lib/libc/stdio/fgetws.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" wchar_t * -fgetws(wchar_t *__restrict ws, int n, FILE *__restrict fp) +fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp) { wchar_t *wsp; long r; diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c index 4232cc7..27b8222 100644 --- a/lib/libc/stdio/fprintf.c +++ b/lib/libc/stdio/fprintf.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> int -fprintf(FILE *__restrict fp, const char *__restrict fmt, ...) +fprintf(FILE * __restrict fp, const char * __restrict fmt, ...) { int ret; va_list ap; diff --git a/lib/libc/stdio/fputws.3 b/lib/libc/stdio/fputws.3 index e9908e6..e6b32a1 100644 --- a/lib/libc/stdio/fputws.3 +++ b/lib/libc/stdio/fputws.3 @@ -49,7 +49,7 @@ .In stdio.h .In wchar.h .Ft int -.Fn fputws "const wchar_t *restrict ws" "FILE *restrict fp" +.Fn fputws "const wchar_t * restrict ws" "FILE * restrict fp" .Sh DESCRIPTION The .Fn fputws diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c index 3cf5299..312d02a 100644 --- a/lib/libc/stdio/fputws.c +++ b/lib/libc/stdio/fputws.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -fputws(const wchar_t *__restrict ws, FILE *__restrict fp) +fputws(const wchar_t * __restrict ws, FILE * __restrict fp) { ORIENTLOCK(fp, 1); diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index 2ff7e2d..7fde56a 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -48,24 +48,24 @@ .Sh SYNOPSIS .In stdio.h .Ft int -.Fn printf "const char *restrict format" ... +.Fn printf "const char * restrict format" ... .Ft int -.Fn fprintf "FILE *restrict stream" "const char *restrict format" ... +.Fn fprintf "FILE * restrict stream" "const char * restrict format" ... .Ft int -.Fn sprintf "char *restrict str" "const char *restrict format" ... +.Fn sprintf "char * restrict str" "const char * restrict format" ... .Ft int -.Fn snprintf "char *restrict str" "size_t size" "const char *restrict format" ... +.Fn snprintf "char * restrict str" "size_t size" "const char * restrict format" ... .Ft int .Fn asprintf "char **ret" "const char *format" ... .In stdarg.h .Ft int -.Fn vprintf "const char *restrict format" "va_list ap" +.Fn vprintf "const char * restrict format" "va_list ap" .Ft int -.Fn vfprintf "FILE *restrict stream" "const char *restrict format" "va_list ap" +.Fn vfprintf "FILE * restrict stream" "const char * restrict format" "va_list ap" .Ft int -.Fn vsprintf "char *restrict str" "const char *restrict format" "va_list ap" +.Fn vsprintf "char * restrict str" "const char * restrict format" "va_list ap" .Ft int -.Fn vsnprintf "char *restrict str" "size_t size" "const char *restrict format" "va_list ap" +.Fn vsnprintf "char * restrict str" "size_t size" "const char * restrict format" "va_list ap" .Ft int .Fn vasprintf "char **ret" "const char *format" "va_list ap" .Sh DESCRIPTION diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c index 1aa2767..cfd10d0 100644 --- a/lib/libc/stdio/printf.c +++ b/lib/libc/stdio/printf.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> int -printf(char const *__restrict fmt, ...) +printf(char const * __restrict fmt, ...) { int ret; va_list ap; diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3 index bfe6487..cb16fa3 100644 --- a/lib/libc/stdio/setbuf.3 +++ b/lib/libc/stdio/setbuf.3 @@ -50,13 +50,13 @@ .Sh SYNOPSIS .In stdio.h .Ft void -.Fn setbuf "FILE *restrict stream" "char *restrict buf" +.Fn setbuf "FILE * restrict stream" "char * restrict buf" .Ft void .Fn setbuffer "FILE *stream" "char *buf" "int size" .Ft int .Fn setlinebuf "FILE *stream" .Ft int -.Fn setvbuf "FILE *restrict stream" "char *restrict buf" "int mode" "size_t size" +.Fn setvbuf "FILE * restrict stream" "char * restrict buf" "int mode" "size_t size" .Sh DESCRIPTION The three types of buffering available are unbuffered, block buffered, and line buffered. diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c index a1edef4..348104c 100644 --- a/lib/libc/stdio/setbuf.c +++ b/lib/libc/stdio/setbuf.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" void -setbuf(FILE *__restrict fp, char *__restrict buf) +setbuf(FILE * __restrict fp, char * __restrict buf) { (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c index 8be8ff6..7ab91e5 100644 --- a/lib/libc/stdio/setvbuf.c +++ b/lib/libc/stdio/setvbuf.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); * a buffer. */ int -setvbuf(FILE *__restrict fp, char *__restrict buf, int mode, size_t size) +setvbuf(FILE * __restrict fp, char * __restrict buf, int mode, size_t size) { int ret, flags; size_t iosize; diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index c053ec9..ee5219e 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -snprintf(char *__restrict str, size_t n, char const *__restrict fmt, ...) +snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...) { size_t on; int ret; diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c index 71279ba..cf1587f 100644 --- a/lib/libc/stdio/sprintf.c +++ b/lib/libc/stdio/sprintf.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -sprintf(char *__restrict str, char const *__restrict fmt, ...) +sprintf(char * __restrict str, char const * __restrict fmt, ...) { int ret; va_list ap; diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 1802fc7..ed0c419 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -332,7 +332,7 @@ __ujtoa(uintmax_t val, char *endp, int base, int octzero, char *xdigs, * MT-safe version */ int -vfprintf(FILE *__restrict fp, const char *__restrict fmt0, va_list ap) +vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap) { int ret; diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c index 253870c..15c3241 100644 --- a/lib/libc/stdio/vprintf.c +++ b/lib/libc/stdio/vprintf.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> int -vprintf(const char *__restrict fmt, __va_list ap) +vprintf(const char * __restrict fmt, __va_list ap) { return (vfprintf(stdout, fmt, ap)); diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c index 7f18c83..ecbce5a 100644 --- a/lib/libc/stdio/vsnprintf.c +++ b/lib/libc/stdio/vsnprintf.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -vsnprintf(char *__restrict str, size_t n, const char *__restrict fmt, +vsnprintf(char * __restrict str, size_t n, const char * __restrict fmt, __va_list ap) { size_t on; diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c index 82e6297..b3150e5 100644 --- a/lib/libc/stdio/vsprintf.c +++ b/lib/libc/stdio/vsprintf.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -vsprintf(char *__restrict str, const char *__restrict fmt, __va_list ap) +vsprintf(char * __restrict str, const char * __restrict fmt, __va_list ap) { int ret; FILE f; diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3 index 5f3a910..e84c3ce 100644 --- a/lib/libc/stdlib/strtod.3 +++ b/lib/libc/stdlib/strtod.3 @@ -49,7 +49,7 @@ string to double .Sh SYNOPSIS .In stdlib.h .Ft double -.Fn strtod "const char *restrict nptr" "char **restrict endptr" +.Fn strtod "const char * restrict nptr" "char ** restrict endptr" .Sh DESCRIPTION The .Fn strtod diff --git a/lib/libc/stdlib/strtod.c b/lib/libc/stdlib/strtod.c index 73765ba..62f8f2a 100644 --- a/lib/libc/stdlib/strtod.c +++ b/lib/libc/stdlib/strtod.c @@ -1191,9 +1191,9 @@ static double tinytens[] = { 1e-16, 1e-32 }; double strtod #ifdef KR_headers - (s00, se) CONST char *__restrict s00; char **__restrict se; + (s00, se) CONST char * __restrict s00; char ** __restrict se; #else - (CONST char *__restrict s00, char **__restrict se) + (CONST char * __restrict s00, char ** __restrict se) #endif { int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c index a41c74f..ec66018 100644 --- a/lib/libc/stdlib/strtoimax.c +++ b/lib/libc/stdlib/strtoimax.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); * alphabets and digits are each contiguous. */ intmax_t -strtoimax(const char *__restrict nptr, char **__restrict endptr, int base) +strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base) { const char *s; uintmax_t acc; diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3 index 25acc8a..f3fb65d 100644 --- a/lib/libc/stdlib/strtol.3 +++ b/lib/libc/stdlib/strtol.3 @@ -52,12 +52,12 @@ integer .In stdlib.h .In limits.h .Ft long -.Fn strtol "const char *restrict nptr" "char **restrict endptr" "int base" +.Fn strtol "const char * restrict nptr" "char ** restrict endptr" "int base" .Ft long long -.Fn strtoll "const char *restrict nptr" "char **restrict endptr" "int base" +.Fn strtoll "const char * restrict nptr" "char ** restrict endptr" "int base" .In inttypes.h .Ft intmax_t -.Fn strtoimax "const char *restrict nptr" "char **restrict endptr" "int base" +.Fn strtoimax "const char * restrict nptr" "char ** restrict endptr" "int base" .In sys/types.h .In stdlib.h .In limits.h diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c index 0f9e1ed..658628e 100644 --- a/lib/libc/stdlib/strtol.c +++ b/lib/libc/stdlib/strtol.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); * alphabets and digits are each contiguous. */ long -strtol(const char *__restrict nptr, char **__restrict endptr, int base) +strtol(const char * __restrict nptr, char ** __restrict endptr, int base) { const char *s; unsigned long acc; diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c index 3d0b5c6..2eb3a50 100644 --- a/lib/libc/stdlib/strtoll.c +++ b/lib/libc/stdlib/strtoll.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); * alphabets and digits are each contiguous. */ long long -strtoll(const char *__restrict nptr, char **__restrict endptr, int base) +strtoll(const char * __restrict nptr, char ** __restrict endptr, int base) { const char *s; unsigned long long acc; diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3 index dae6c13..2343093 100644 --- a/lib/libc/stdlib/strtoul.3 +++ b/lib/libc/stdlib/strtoul.3 @@ -52,12 +52,12 @@ integer .In stdlib.h .In limits.h .Ft "unsigned long" -.Fn strtoul "const char *restrict nptr" "char **restrict endptr" "int base" +.Fn strtoul "const char * restrict nptr" "char ** restrict endptr" "int base" .Ft "unsigned long long" -.Fn strtoull "const char *restrict nptr" "char **restrict endptr" "int base" +.Fn strtoull "const char * restrict nptr" "char ** restrict endptr" "int base" .In inttypes.h .Ft uintmax_t -.Fn strtoumax "const char *restrict nptr" "char **restrict endptr" "int base" +.Fn strtoumax "const char * restrict nptr" "char ** restrict endptr" "int base" .In sys/types.h .In stdlib.h .In limits.h diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c index ee54a41..2146a98 100644 --- a/lib/libc/stdlib/strtoul.c +++ b/lib/libc/stdlib/strtoul.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); * alphabets and digits are each contiguous. */ unsigned long -strtoul(const char *__restrict nptr, char **__restrict endptr, int base) +strtoul(const char * __restrict nptr, char ** __restrict endptr, int base) { const char *s; unsigned long acc; diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c index 08bf118..1720a8f 100644 --- a/lib/libc/stdlib/strtoull.c +++ b/lib/libc/stdlib/strtoull.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); * alphabets and digits are each contiguous. */ unsigned long long -strtoull(const char *__restrict nptr, char **__restrict endptr, int base) +strtoull(const char * __restrict nptr, char ** __restrict endptr, int base) { const char *s; unsigned long long acc; diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c index 07206be..ddaee59 100644 --- a/lib/libc/stdlib/strtoumax.c +++ b/lib/libc/stdlib/strtoumax.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); * alphabets and digits are each contiguous. */ uintmax_t -strtoumax(const char *__restrict nptr, char **__restrict endptr, int base) +strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base) { const char *s; uintmax_t acc; diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c index 5729bd5..d3d6e7e 100644 --- a/lib/libc/stdlib/tdelete.c +++ b/lib/libc/stdlib/tdelete.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); * compar: function to carry out node comparisons */ void * -tdelete(const void *__restrict vkey, void **__restrict vrootp, +tdelete(const void * __restrict vkey, void ** __restrict vrootp, int (*compar)(const void *, const void *)) { node_t **rootp = (node_t **)vrootp; diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3 index 06ff720..8ff0179 100644 --- a/lib/libc/stdlib/tsearch.3 +++ b/lib/libc/stdlib/tsearch.3 @@ -36,7 +36,7 @@ .Sh SYNOPSIS .In search.h .Ft void * -.Fn tdelete "const void *restrict key" "void **restrict rootp" "int (*compar) (const void *, const void *)" +.Fn tdelete "const void * restrict key" "void ** restrict rootp" "int (*compar) (const void *, const void *)" .Ft void * .Fn tfind "const void *key" "void **rootp" "int (*compar) (const void *, const void *)" .Ft void * diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3 index 08e17d0..7e71df5 100644 --- a/lib/libc/stdtime/strftime.3 +++ b/lib/libc/stdtime/strftime.3 @@ -48,10 +48,10 @@ .In time.h .Ft size_t .Fo strftime -.Fa "char *restrict buf" +.Fa "char * restrict buf" .Fa "size_t maxsize" -.Fa "const char *restrict format" -.Fa "const struct tm *restrict timeptr" +.Fa "const char * restrict format" +.Fa "const struct tm * restrict timeptr" .Fc .Sh DESCRIPTION The diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c index ab50bdc..434557e 100644 --- a/lib/libc/stdtime/strftime.c +++ b/lib/libc/stdtime/strftime.c @@ -44,14 +44,14 @@ static char * _add(const char *, char *, const char *); static char * _conv(int, const char *, char *, const char *); static char * _fmt(const char *, const struct tm *, char *, const char *); -size_t strftime(char *__restrict, size_t, const char *__restrict, - const struct tm *__restrict); +size_t strftime(char * __restrict, size_t, const char * __restrict, + const struct tm * __restrict); extern char * tzname[]; size_t -strftime(char *__restrict s, size_t maxsize, const char *__restrict format, - const struct tm *__restrict t) +strftime(char * __restrict s, size_t maxsize, const char * __restrict format, + const struct tm * __restrict t) { char *p; diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3 index c3f55cf..91b810f 100644 --- a/lib/libc/stdtime/strptime.3 +++ b/lib/libc/stdtime/strptime.3 @@ -37,9 +37,9 @@ .In time.h .Ft char * .Fo strptime -.Fa "const char *restrict buf" -.Fa "const char *restrict format" -.Fa "struct tm *restrict timeptr" +.Fa "const char * restrict buf" +.Fa "const char * restrict format" +.Fa "struct tm * restrict timeptr" .Fc .Sh DESCRIPTION The diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c index be84482..edb0d3c 100644 --- a/lib/libc/stdtime/strptime.c +++ b/lib/libc/stdtime/strptime.c @@ -517,8 +517,8 @@ label: char * -strptime(const char *__restrict buf, const char *__restrict fmt, - struct tm *__restrict tm) +strptime(const char * __restrict buf, const char * __restrict fmt, + struct tm * __restrict tm) { char *ret; diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3 index 506cd89..ac4f7b0d 100644 --- a/lib/libc/string/strcat.3 +++ b/lib/libc/string/strcat.3 @@ -47,9 +47,9 @@ .Sh SYNOPSIS .In string.h .Ft char * -.Fn strcat "char *restrict s" "const char *restrict append" +.Fn strcat "char * restrict s" "const char * restrict append" .Ft char * -.Fn strncat "char *restrict s" "const char *restrict append" "size_t count" +.Fn strncat "char * restrict s" "const char * restrict append" "size_t count" .Sh DESCRIPTION The .Fn strcat diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c index f7654d6..d30389d 100644 --- a/lib/libc/string/strcat.c +++ b/lib/libc/string/strcat.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> char * -strcat(char *__restrict s, const char *__restrict append) +strcat(char * __restrict s, const char * __restrict append) { char *save = s; diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3 index 9a61727..9f4410d 100644 --- a/lib/libc/string/strcpy.3 +++ b/lib/libc/string/strcpy.3 @@ -47,9 +47,9 @@ .Sh SYNOPSIS .In string.h .Ft char * -.Fn strcpy "char *restrict dst" "const char *restrict src" +.Fn strcpy "char * restrict dst" "const char * restrict src" .Ft char * -.Fn strncpy "char *restrict dst" "const char *restrict src" "size_t len" +.Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len" .Sh DESCRIPTION The .Fn strcpy diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c index 56bc1a8..630ae23 100644 --- a/lib/libc/string/strcpy.c +++ b/lib/libc/string/strcpy.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> char * -strcpy(char *__restrict to, const char *__restrict from) +strcpy(char * __restrict to, const char * __restrict from) { char *save = to; diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c index 2cf8f83..4218ae2 100644 --- a/lib/libc/string/strncat.c +++ b/lib/libc/string/strncat.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); * are written at dst (at most n+1 bytes being appended). Return dst. */ char * -strncat(char *__restrict dst, const char *__restrict src, size_t n) +strncat(char * __restrict dst, const char * __restrict src, size_t n) { if (n != 0) { char *d = dst; diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c index 90f8482..7759e61 100644 --- a/lib/libc/string/strncpy.c +++ b/lib/libc/string/strncpy.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); * Return dst. */ char * -strncpy(char *__restrict dst, const char *__restrict src, size_t n) +strncpy(char * __restrict dst, const char * __restrict src, size_t n) { if (n != 0) { char *d = dst; diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3 index 9cd584e..fcebf6f 100644 --- a/lib/libc/string/strxfrm.3 +++ b/lib/libc/string/strxfrm.3 @@ -47,7 +47,7 @@ .Sh SYNOPSIS .In string.h .Ft size_t -.Fn strxfrm "char *restrict dst" "const char *restrict src" "size_t n" +.Fn strxfrm "char * restrict dst" "const char * restrict src" "size_t n" .Sh DESCRIPTION The .Fn strxfrm diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c index 3e57a3c..81e05af 100644 --- a/lib/libc/string/strxfrm.c +++ b/lib/libc/string/strxfrm.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include "collate.h" size_t -strxfrm(char *__restrict dest, const char *__restrict src, size_t len) +strxfrm(char * __restrict dest, const char * __restrict src, size_t len) { int prim, sec, l; size_t slen; |
