Date: Tue, 1 Dec 2015 06:51:59 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r291571 - stable/9/lib/libc/stdio Message-ID: <201512010651.tB16px5L038123@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Dec 1 06:51:59 2015 New Revision: 291571 URL: https://svnweb.freebsd.org/changeset/base/291571 Log: MFstable/10 r291336: MFC r288006,r288031,r288032,r288033: r288006 (by rodrigc): Add declarations to eliminate -Wmissing-prototypes warnings r288031 (by rodrigc): Remove names from some prototypes r288032 (by rodrigc): Remove names from some prototypes r288033 (by rodrigc): Use ANSI C prototypes. Eliminates -Wold-style-definition warnings. Modified: stable/9/lib/libc/stdio/_flock_stub.c stable/9/lib/libc/stdio/fgetwln.c stable/9/lib/libc/stdio/findfp.c stable/9/lib/libc/stdio/getchar.c stable/9/lib/libc/stdio/vfscanf.c Directory Properties: stable/9/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/stdio/_flock_stub.c ============================================================================== --- stable/9/lib/libc/stdio/_flock_stub.c Tue Dec 1 06:29:11 2015 (r291570) +++ stable/9/lib/libc/stdio/_flock_stub.c Tue Dec 1 06:51:59 2015 (r291571) @@ -55,6 +55,9 @@ __weak_reference(_flockfile_debug_stub, __weak_reference(_ftrylockfile, ftrylockfile); __weak_reference(_funlockfile, funlockfile); +void _flockfile_debug_stub(FILE *, char *, int); +int _ftrylockfile(FILE *); + void _flockfile(FILE *fp) { Modified: stable/9/lib/libc/stdio/fgetwln.c ============================================================================== --- stable/9/lib/libc/stdio/fgetwln.c Tue Dec 1 06:29:11 2015 (r291570) +++ stable/9/lib/libc/stdio/fgetwln.c Tue Dec 1 06:51:59 2015 (r291571) @@ -40,6 +40,8 @@ __FBSDID("$FreeBSD$"); #include "local.h" #include "xlocale_private.h" +wchar_t *fgetwln_l(FILE * __restrict, size_t *, locale_t); + wchar_t * fgetwln_l(FILE * __restrict fp, size_t *lenp, locale_t locale) { Modified: stable/9/lib/libc/stdio/findfp.c ============================================================================== --- stable/9/lib/libc/stdio/findfp.c Tue Dec 1 06:29:11 2015 (r291570) +++ stable/9/lib/libc/stdio/findfp.c Tue Dec 1 06:51:59 2015 (r291571) @@ -114,7 +114,7 @@ moreglue(n) * Find a free FILE for fopen et al. */ FILE * -__sfp() +__sfp(void) { FILE *fp; int n; @@ -165,6 +165,7 @@ found: */ __warn_references(f_prealloc, "warning: this program uses f_prealloc(), which is not recommended."); +void f_prealloc(void); void f_prealloc(void) @@ -196,7 +197,7 @@ f_prealloc(void) * The name `_cleanup' is, alas, fairly well known outside stdio. */ void -_cleanup() +_cleanup(void) { /* (void) _fwalk(fclose); */ (void) _fwalk(__sflush); /* `cheating' */ @@ -206,7 +207,7 @@ _cleanup() * __sinit() is called whenever stdio's internal variables must be set up. */ void -__sinit() +__sinit(void) { /* Make sure we clean up on exit. */ Modified: stable/9/lib/libc/stdio/getchar.c ============================================================================== --- stable/9/lib/libc/stdio/getchar.c Tue Dec 1 06:29:11 2015 (r291570) +++ stable/9/lib/libc/stdio/getchar.c Tue Dec 1 06:51:59 2015 (r291571) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #undef getchar_unlocked int -getchar() +getchar(void) { int retval; FLOCKFILE(stdin); Modified: stable/9/lib/libc/stdio/vfscanf.c ============================================================================== --- stable/9/lib/libc/stdio/vfscanf.c Tue Dec 1 06:29:11 2015 (r291570) +++ stable/9/lib/libc/stdio/vfscanf.c Tue Dec 1 06:51:59 2015 (r291571) @@ -817,9 +817,7 @@ match_failure: * considered part of the scanset. */ static const u_char * -__sccl(tab, fmt) - char *tab; - const u_char *fmt; +__sccl(char *tab, const u_char *fmt) { int c, n, v, i; struct xlocale_collate *table =
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512010651.tB16px5L038123>