Mercurial > hg > octave-lojdl > gnulib-hg
changeset 9183:cc316ffcb4fc
Rename __fpending.c -> fpending.c and __fpending.h -> fpending.h
* lib/fpending.h: Rename from __fpending.h.
* lib/fpending.c: Rename from __fpending.c.
Include "fpending.h", not "__fpending.h".
* lib/__fpending.h, lib/__fpending.c: Remove files.
* modules/fpending (Files): Reflect new file names.
* lib/close-stream.c: Include "fpending.h", not "__fpending.h".
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sat, 08 Sep 2007 19:25:52 +0000 |
| parents | 97ef915eafb0 |
| children | 2a90f2e752ac |
| files | ChangeLog lib/__fpending.c lib/__fpending.h lib/close-stream.c lib/fpending.c lib/fpending.h modules/fpending |
| diffstat | 7 files changed, 79 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-09-08 Jim Meyering <jim@meyering.net> + + Rename __fpending.c -> fpending.c and __fpending.h -> fpending.h + * lib/fpending.h: Rename from __fpending.h. + * lib/fpending.c: Rename from __fpending.c. + Include "fpending.h", not "__fpending.h". + * lib/__fpending.h, lib/__fpending.c: Remove files. + * modules/fpending (Files): Reflect new file names. + * lib/close-stream.c: Include "fpending.h", not "__fpending.h". + 2007-09-08 Bruno Haible <bruno@clisp.org> * m4/inttypes-h.m4: Remove stub file.
deleted file mode 100644 --- a/lib/__fpending.c +++ /dev/null @@ -1,30 +0,0 @@ -/* __fpending.c -- return the number of pending output bytes on a stream - Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* Written by Jim Meyering. */ - -#include <config.h> - -#include "__fpending.h" - -/* Return the number of pending (aka buffered, unflushed) - bytes on the stream, FP, that is open for writing. */ -size_t -__fpending (FILE *fp) -{ - return PENDING_OUTPUT_N_BYTES; -}
deleted file mode 100644 --- a/lib/__fpending.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Declare __fpending. - - Copyright (C) 2000, 2003, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Written by Jim Meyering. */ - -#include <stddef.h> -#include <stdio.h> - -#ifndef HAVE_DECL___FPENDING -"this configure-time declaration test was not run" -#endif - -#if HAVE_DECL___FPENDING -# if HAVE_STDIO_EXT_H -# include <stdio_ext.h> -# endif -#else -size_t __fpending (FILE *); -#endif
--- a/lib/close-stream.c +++ b/lib/close-stream.c @@ -1,6 +1,6 @@ /* Close a stream, with nicer error checking than fclose's. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006 Free + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -24,7 +24,7 @@ #include <errno.h> #include <stdbool.h> -#include "__fpending.h" +#include "fpending.h" #if USE_UNLOCKED_IO # include "unlocked-io.h"
new file mode 100644 --- /dev/null +++ b/lib/fpending.c @@ -0,0 +1,30 @@ +/* fpending.c -- return the number of pending output bytes on a stream + Copyright (C) 2000, 2004, 2006, 2007 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Jim Meyering. */ + +#include <config.h> + +#include "fpending.h" + +/* Return the number of pending (aka buffered, unflushed) + bytes on the stream, FP, that is open for writing. */ +size_t +__fpending (FILE *fp) +{ + return PENDING_OUTPUT_N_BYTES; +}
new file mode 100644 --- /dev/null +++ b/lib/fpending.h @@ -0,0 +1,34 @@ +/* Declare __fpending. + + Copyright (C) 2000, 2003, 2005, 2006 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Written by Jim Meyering. */ + +#include <stddef.h> +#include <stdio.h> + +#ifndef HAVE_DECL___FPENDING +"this configure-time declaration test was not run" +#endif + +#if HAVE_DECL___FPENDING +# if HAVE_STDIO_EXT_H +# include <stdio_ext.h> +# endif +#else +size_t __fpending (FILE *); +#endif
--- a/modules/fpending +++ b/modules/fpending @@ -2,8 +2,8 @@ Determine the number of bytes waiting in the output buffer of a stream. Files: -lib/__fpending.h -lib/__fpending.c +lib/fpending.h +lib/fpending.c m4/fpending.m4 Depends-on: @@ -14,7 +14,7 @@ Makefile.am: Include: -"__fpending.h" +"fpending.h" License: GPL