Date: Sun, 8 Sep 2002 21:52:36 -0700 (PDT) From: Jonathan Mini <mini@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17255 for review Message-ID: <200209090452.g894qaDr088909@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17255 Change 17255 by mini@freefall on 2002/09/08 21:52:26 IFC @17254. Affected files ... .. //depot/projects/kse/include/dirent.h#2 integrate .. //depot/projects/kse/include/inttypes.h#4 integrate .. //depot/projects/kse/include/search.h#4 integrate .. //depot/projects/kse/include/stdio.h#4 integrate .. //depot/projects/kse/include/stdlib.h#5 integrate .. //depot/projects/kse/include/time.h#5 integrate .. //depot/projects/kse/include/unistd.h#3 integrate .. //depot/projects/kse/include/wchar.h#4 integrate .. //depot/projects/kse/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/kse/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/kse/lib/libc/gen/statvfs.3#2 integrate .. //depot/projects/kse/lib/libc/gen/statvfs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#5 integrate .. //depot/projects/kse/lib/libc/locale/mbrlen.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrlen.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrtowc.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.c#3 integrate .. //depot/projects/kse/lib/libc/locale/multibyte.3#4 integrate .. //depot/projects/kse/lib/libc/locale/wcrtomb.3#2 integrate .. //depot/projects/kse/lib/libc/locale/wcrtomb.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcsrtombs.3#2 integrate .. //depot/projects/kse/lib/libc/locale/wcsrtombs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcstol.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcstol.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcstoul.c#1 branch .. //depot/projects/kse/lib/libc/net/inet.3#3 integrate .. //depot/projects/kse/lib/libc/net/inet_ntop.c#3 integrate .. //depot/projects/kse/lib/libc/net/inet_pton.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/kse/lib/libc/stdio/printf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/setbuf.3#3 integrate .. //depot/projects/kse/lib/libc/stdio/setbuf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/setvbuf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/snprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/sprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/vprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/vsnprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/vsprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtod.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtod.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoimax.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtol.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoll.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoul.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoul.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoull.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoumax.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/tsearch.3#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.c#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strptime.3#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/kse/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/string/strcat.3#3 integrate .. //depot/projects/kse/lib/libc/string/strcat.c#3 integrate .. //depot/projects/kse/lib/libc/string/strcpy.3#3 integrate .. //depot/projects/kse/lib/libc/string/strcpy.c#3 integrate .. //depot/projects/kse/lib/libc/string/strncat.c#3 integrate .. //depot/projects/kse/lib/libc/string/strncpy.c#3 integrate .. //depot/projects/kse/lib/libc/string/strtok.c#2 integrate .. //depot/projects/kse/lib/libc/string/strxfrm.3#3 integrate .. //depot/projects/kse/lib/libc/string/strxfrm.c#3 integrate .. //depot/projects/kse/lib/libc/string/wcscat.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcscpy.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsncat.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsncpy.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsstr.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcstok.3#1 branch .. //depot/projects/kse/lib/libc/string/wcstok.c#1 branch .. //depot/projects/kse/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/kse/lib/libc/string/wmemcpy.c#2 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#42 integrate .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#29 integrate .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#15 integrate .. //depot/projects/kse/sys/conf/NOTES#16 integrate .. //depot/projects/kse/sys/conf/files#49 integrate .. //depot/projects/kse/sys/conf/files.i386#29 integrate .. //depot/projects/kse/sys/conf/options#26 integrate .. //depot/projects/kse/sys/conf/options.i386#21 integrate .. //depot/projects/kse/sys/conf/options.pc98#20 integrate .. //depot/projects/kse/sys/conf/options.x86_64#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#29 integrate .. //depot/projects/kse/sys/dev/acpica/acpivar.h#16 integrate .. //depot/projects/kse/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/kse/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/kse/sys/dev/en/midway.c#3 integrate .. //depot/projects/kse/sys/dev/isp/isp.c#23 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.c#17 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#15 integrate .. //depot/projects/kse/sys/dev/isp/ispvar.h#14 integrate .. //depot/projects/kse/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/miidevs#7 integrate .. //depot/projects/kse/sys/dev/mii/miidevs.h#7 integrate .. //depot/projects/kse/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/kse/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/kse/sys/dev/sab/sab.c#2 integrate .. //depot/projects/kse/sys/geom/geom.h#8 integrate .. //depot/projects/kse/sys/geom/geom_bsd.c#8 integrate .. //depot/projects/kse/sys/geom/geom_dev.c#7 integrate .. //depot/projects/kse/sys/geom/geom_dump.c#6 integrate .. //depot/projects/kse/sys/geom/geom_mbr.c#7 integrate .. //depot/projects/kse/sys/geom/geom_subr.c#8 integrate .. //depot/projects/kse/sys/geom/geom_sunlabel.c#6 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#37 integrate .. //depot/projects/kse/sys/i386/i386/initcpu.c#8 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#57 integrate .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#66 integrate .. //depot/projects/kse/sys/i386/include/pci_cfgreg.h#4 integrate .. //depot/projects/kse/sys/i386/isa/npx.c#20 integrate .. //depot/projects/kse/sys/i386/linux/linux_ptrace.c#6 integrate .. //depot/projects/kse/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/kse/sys/i386/pci/pci_bus.c#9 integrate .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#13 integrate .. //depot/projects/kse/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/kse/sys/ia64/conf/SKI#6 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#38 integrate .. //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#23 integrate .. //depot/projects/kse/sys/kern/imgact_aout.c#16 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#24 integrate .. //depot/projects/kse/sys/kern/kern_conf.c#12 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#84 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#108 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#31 integrate .. //depot/projects/kse/sys/kern/sys_process.c#31 integrate .. //depot/projects/kse/sys/modules/Makefile#33 integrate .. //depot/projects/kse/sys/modules/aout/Makefile#1 branch .. //depot/projects/kse/sys/modules/if_gre/Makefile#1 branch .. //depot/projects/kse/sys/modules/linux/Makefile#9 integrate .. //depot/projects/kse/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/kse/sys/net/ethernet.h#7 integrate .. //depot/projects/kse/sys/net/if_gre.c#1 branch .. //depot/projects/kse/sys/net/if_gre.h#1 branch .. //depot/projects/kse/sys/netatalk/at.h#2 integrate .. //depot/projects/kse/sys/netinet/in_proto.c#6 integrate .. //depot/projects/kse/sys/netinet/ip_gre.c#1 branch .. //depot/projects/kse/sys/netinet/ip_gre.h#1 branch .. //depot/projects/kse/sys/netns/ns.h#4 integrate .. //depot/projects/kse/sys/netns/ns_if.h#3 integrate .. //depot/projects/kse/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/kse/sys/nfsclient/nfsmount.h#4 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#33 integrate .. //depot/projects/kse/sys/pccard/pccard.c#12 integrate .. //depot/projects/kse/sys/pci/if_rl.c#14 integrate .. //depot/projects/kse/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/kse/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#15 integrate .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#38 integrate .. //depot/projects/kse/sys/sys/disklabel.h#13 integrate .. //depot/projects/kse/sys/sys/proc.h#131 integrate .. //depot/projects/kse/sys/sys/systm.h#31 integrate .. //depot/projects/kse/sys/sys/ucontext.h#9 integrate Differences ... ==== //depot/projects/kse/include/dirent.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.11 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/dirent.h,v 1.12 2002/09/09 03:52:43 mike Exp $ */ #ifndef _DIRENT_H_ @@ -87,20 +87,21 @@ #include <sys/cdefs.h> __BEGIN_DECLS -DIR *opendir(const char *); -struct dirent *readdir(DIR *); -void rewinddir(DIR *); -int closedir(DIR *); +DIR *opendir(const char *); +struct dirent * + readdir(DIR *); +void rewinddir(DIR *); +int closedir(DIR *); #ifndef _POSIX_SOURCE -DIR *__opendir2(const char *, int); -long telldir(DIR *); -void seekdir(DIR *, long); -int scandir(const char *, struct dirent ***, - int (*)(struct dirent *), int (*)(const void *, const void *)); -int alphasort(const void *, const void *); -int getdents(int, char *, int); -int getdirentries(int, char *, int, long *); -int readdir_r(DIR *, struct dirent *, struct dirent **); +DIR *__opendir2(const char *, int); +long telldir(DIR *); +void seekdir(DIR *, long); +int scandir(const char *, struct dirent ***, + int (*)(struct dirent *), int (*)(const void *, const void *)); +int alphasort(const void *, const void *); +int getdents(int, char *, int); +int getdirentries(int, char *, int, long *); +int readdir_r(DIR *, struct dirent *, struct dirent **); #endif /* not POSIX */ __END_DECLS ==== //depot/projects/kse/include/inttypes.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.6 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.7 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _INTTYPES_H_ @@ -48,8 +48,8 @@ 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); ==== //depot/projects/kse/include/search.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ -/* $FreeBSD: src/include/search.h,v 1.6 2002/08/21 16:19:55 mike Exp $ */ +/* $FreeBSD: src/include/search.h,v 1.7 2002/09/06 11:23:32 tjr Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org> @@ -44,7 +44,7 @@ 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 *)); ==== //depot/projects/kse/include/stdio.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.45 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/stdio.h,v 1.46 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _STDIO_H_ @@ -221,7 +221,7 @@ 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 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 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 ==== //depot/projects/kse/include/stdlib.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.40 2002/09/01 07:08:22 tjr Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.41 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _STDLIB_H_ @@ -113,17 +113,17 @@ 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 @@ #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); ==== //depot/projects/kse/include/time.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.29 2002/09/03 00:06:57 mike Exp $ + * $FreeBSD: src/include/time.h,v 1.30 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _TIME_H_ @@ -121,8 +121,8 @@ 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 @@ #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 ==== //depot/projects/kse/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.56 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/unistd.h,v 1.57 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _UNISTD_H_ @@ -190,7 +190,7 @@ * 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 @@ 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); ==== //depot/projects/kse/include/wchar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.16 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/wchar.h,v 1.20 2002/09/08 13:27:26 tjr Exp $ */ /*- @@ -111,9 +111,9 @@ 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); @@ -144,8 +144,13 @@ size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t, mbstate_t * __restrict); size_t wcsspn(const wchar_t *, const wchar_t *); -wchar_t *wcsstr(const wchar_t *, const wchar_t *); +wchar_t *wcsstr(const wchar_t * __restrict, const wchar_t * __restrict); int wctob(wint_t); +wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, + wchar_t ** __restrict); +long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); +unsigned long + wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int); wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); int wmemcmp(const wchar_t *, const wchar_t *, size_t); wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); ==== //depot/projects/kse/lib/libc/gen/getgrouplist.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.11 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.12 2002/09/08 04:43:28 wollman Exp $"); /* * get credential @@ -85,6 +85,7 @@ } } skip: + ; } endgrent(); *grpcnt = ngroups; ==== //depot/projects/kse/lib/libc/gen/siglist.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)siglist.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/siglist.c,v 1.3 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/siglist.c,v 1.4 2002/09/07 08:14:19 jmallett Exp $"); #include <sys/cdefs.h> #include <signal.h> @@ -72,7 +72,7 @@ "winch", /* SIGWINCH */ "info", /* SIGINFO */ "usr1", /* SIGUSR1 */ - "usr2", /* SIGUSR2 */ + "usr2" /* SIGUSR2 */ }; const char *const sys_siglist[NSIG] = { ==== //depot/projects/kse/lib/libc/gen/statvfs.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.3 2002/07/16 20:40:12 wollman Exp $ +.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.4 2002/09/06 11:23:40 tjr Exp $ .\" .Dd July 13, 2002 .Dt 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 ==== //depot/projects/kse/lib/libc/gen/statvfs.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/statvfs.c,v 1.1 2002/07/11 22:54:11 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/statvfs.c,v 1.2 2002/09/06 11:23:40 tjr Exp $"); #include "namespace.h" #include <sys/param.h> @@ -70,7 +70,7 @@ } int -statvfs(const char *__restrict path, struct statvfs *__restrict result) +statvfs(const char * __restrict path, struct statvfs * __restrict result) { struct statfs sfs; int rv; ==== //depot/projects/kse/lib/libc/locale/Makefile.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.35 2002/08/31 11:26:55 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.36 2002/09/08 13:27:26 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale @@ -11,8 +11,8 @@ mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcstombs.c \ - wctob.c wctomb.c wctrans.c wctype.c wcwidth.c + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcstol.c wcstombs.c \ + wcstoul.c wctob.c wctomb.c wctrans.c wctype.c wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ @@ -22,8 +22,8 @@ mbsrtowcs.3 multibyte.3 \ nl_langinfo.3 \ rune.3 \ - setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsrtombs.3 \ - wcrtomb.3 \ + setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcrtomb.3 \ + wcsrtombs.3 wcstol.3 \ wctrans.3 wctype.3 wcwidth.3 MAN+= euc.4 utf2.4 @@ -45,6 +45,7 @@ rune.3 sputrune.3 MLINKS+=setlocale.3 localeconv.3 MLINKS+=towlower.3 towupper.3 +MLINKS+=wcstol.3 wcstoul.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 .endif ==== //depot/projects/kse/lib/libc/locale/mbrlen.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 16, 2002 .Dt MBRLEN 3 .Os @@ -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 ==== //depot/projects/kse/lib/libc/locale/mbrlen.c#2 (text+ko) ==== @@ -25,12 +25,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #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)); ==== //depot/projects/kse/lib/libc/locale/mbrtowc.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 15, 2002 .Dt MBRTOWC 3 .Os @@ -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 ==== //depot/projects/kse/lib/libc/locale/mbrtowc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include <errno.h> #include <rune.h> @@ -33,8 +33,8 @@ #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; ==== //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 16, 2002 .Dt MBSRTOWCS 3 .Os @@ -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 ==== //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include <errno.h> #include <limits.h> @@ -33,8 +33,8 @@ #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; ==== //depot/projects/kse/lib/libc/locale/mbstowcs.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.3 2002/09/01 07:08:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.4 2002/09/06 11:23:45 tjr Exp $"); #include <errno.h> #include <stdlib.h> @@ -45,8 +45,8 @@ 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; ==== //depot/projects/kse/lib/libc/locale/mbtowc.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.3 2002/09/03 01:09:47 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.4 2002/09/06 11:23:45 tjr Exp $"); #include <errno.h> #include <stdlib.h> @@ -44,8 +44,8 @@ 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; ==== //depot/projects/kse/lib/libc/locale/multibyte.3#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)multibyte.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.15 2002/09/01 07:21:58 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.16 2002/09/06 11:23:45 tjr Exp $ .\" .Dd June 4, 1993 .Dt 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 ==== //depot/projects/kse/lib/libc/locale/wcrtomb.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcrtomb.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcrtomb.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 15, 2002 .Dt WCRTOMB 3 .Os @@ -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 ==== //depot/projects/kse/lib/libc/locale/wcrtomb.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include <errno.h> #include <rune.h> @@ -33,7 +33,7 @@ #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; ==== //depot/projects/kse/lib/libc/locale/wcsrtombs.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 16, 2002 .Dt WCSRTOMBS 3 .Os @@ -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 ==== //depot/projects/kse/lib/libc/locale/wcsrtombs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include <errno.h> #include <limits.h> @@ -34,8 +34,8 @@ #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; ==== //depot/projects/kse/lib/libc/locale/wcstombs.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.3 2002/09/01 07:08:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.4 2002/09/06 11:23:45 tjr Exp $"); #include <errno.h> #include <stdlib.h> @@ -45,8 +45,8 @@ 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]; ==== //depot/projects/kse/lib/libc/net/inet.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.24 2002/08/15 20:33:44 robert Exp $ +.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.25 2002/09/06 11:23:49 tjr Exp $ .\" .Dd June 17, 1996 .Dt 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 ==== //depot/projects/kse/lib/libc/net/inet_ntop.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.11 2002/08/15 21:19:31 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.12 2002/09/06 11:23:49 tjr Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -47,7 +47,7 @@ * 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) { ==== //depot/projects/kse/lib/libc/net/inet_pton.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.11 2002/09/06 11:23:49 tjr Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -48,7 +48,7 @@ * 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: ==== //depot/projects/kse/lib/libc/stdio/fgetws.3#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" @(#)fgets.3 8.1 (Berkeley) 6/4/93 .\" FreeBSD: src/lib/libc/stdio/fgets.3,v 1.16 2002/05/31 05:01:17 archie Exp -.\" $FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.1 2002/08/13 09:30:41 tjr Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.2 2002/09/06 11:23:55 tjr Exp $ .\" .Dd August 6, 2002 .Dt FGETWS 3 @@ -49,7 +49,7 @@ .In stdio.h .In wchar.h >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209090452.g894qaDr088909>