Update.

1998-06-11  Ulrich Drepper  <drepper@cygnus.com>

	* libc.map: Don't export argp's fmtstream handling functions.

4 files changed, 19 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 4976978a5d..1dc8862d95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-06-11  Ulrich Drepper  <drepper@cygnus.com>
+
+	* libc.map: Don't export argp's fmtstream handling functions.
+
 1998-06-03 03:09  Geoff Keating  <geoffk@ozemail.com.au>
 
 	* sysdeps/unix/sysv/linux/pread.c: Detect missing syscall, like poll().
diff --git a/libc.map b/libc.map
index 7381033cfc..3d3f45a4eb 100644
--- a/libc.map
+++ b/libc.map
@@ -527,11 +527,14 @@ GLIBC_2.1 {
     # a*
     addseverity; alphasort64;
 
-    argp_error; argp_failure; argp_fmtstream_free; argp_fmtstream_point;
-    argp_fmtstream_printf; argp_fmtstream_putc; argp_fmtstream_puts;
-    argp_fmtstream_set_lmargin; argp_fmtstream_set_rmargin;
-    argp_fmtstream_set_wmargin; argp_fmtstream_write; argp_help;
-    argp_make_fmtstream; argp_parse; argp_state_help; argp_usage;
+    argp_error; argp_failure; argp_help; argp_parse; argp_state_help;
+    argp_usage;
+
+    # These probably shouldn't be exported, they are internal.
+    # argp_fmtstream_free; argp_fmtstream_point; argp_fmtstream_printf;
+    # argp_fmtstream_putc; argp_fmtstream_puts; argp_fmtstream_set_lmargin;
+    # argp_fmtstream_set_rmargin; argp_fmtstream_set_wmargin;
+    # argp_fmtstream_write; argp_make_fmtstream;
 
     authdes_create; authdes_getucred; authdes_pk_create;
 
diff --git a/manual/argp.texi b/manual/argp.texi
index 4b72ebe5a7..ab16fe3266 100644
--- a/manual/argp.texi
+++ b/manual/argp.texi
@@ -1,7 +1,7 @@
 @ignore
    Documentation for the argp argument parser
 
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -59,7 +59,7 @@ call to @code{argp_parse} is the only argument-parsing code needed in
 
 @comment argp.h
 @comment GNU
-@deftypefun {error_t} argp_parse (const struct argp *@var{argp}, @w{int @var{argc}, char **@var{argv}}, @w{unsigned @var{flags}}, @w{int *@var{arg_index}}, @w{void *@var{input}})
+@deftypefun {error_t} argp_parse (const struct argp *@var{argp}, int @var{argc}, char **@var{argv}, unsigned @var{flags}, int *@var{arg_index}, void *@var{input})
 The @code{argp_parse} function parses the arguments in in @var{argv}, of
 length @var{argc}, using the argp parser @var{argp} (@pxref{Argp
 Parsers}); a value of zero is the same as a @code{struct argp}
@@ -583,7 +583,7 @@ with @code{exit (argp_err_exit_status)} (@pxref{Argp Global Variables}).
 @cindex syntax error messages, in argp
 @comment argp.h
 @comment GNU
-@deftypefun void argp_error (const struct argp_state *@var{state}, @w{const char *@var{fmt}, @dots{}})
+@deftypefun void argp_error (const struct argp_state *@var{state}, const char *@var{fmt}, @dots{})
 Print the printf format string @var{fmt} and following args, preceded by
 the program name and @samp{:}, and followed by a @w{@samp{Try @dots{}
 --help}} message, and terminate the program with an exit status of
@@ -593,7 +593,7 @@ the program name and @samp{:}, and followed by a @w{@samp{Try @dots{}
 @cindex error messages, in argp
 @comment argp.h
 @comment GNU
-@deftypefun void argp_failure (const struct argp_state *@var{state}, @w{int @var{status}, int @var{errnum},} @w{const char *@var{fmt}, @dots{}})
+@deftypefun void argp_failure (const struct argp_state *@var{state}, int @var{status}, int @var{errnum}, const char *@var{fmt}, @dots{})
 Similarly to the standard gnu error-reporting function @code{error},
 print the printf format string @var{fmt} and following args, preceded by
 the program name and @samp{:}, and followed by the standard unix error
@@ -609,7 +609,7 @@ values for options, bad phase of the moon, etc.
 
 @comment argp.h
 @comment GNU
-@deftypefun void argp_state_help (const struct argp_state *@var{state}, @w{FILE *@var{stream}}, @w{unsigned @var{flags}})
+@deftypefun void argp_state_help (const struct argp_state *@var{state}, FILE *@var{stream}, unsigned @var{flags})
 Output a help message for the argp parser referred to by @var{state} to
 @var{stream}.  The @var{flags} argument determines what sort of help
 message is produced.  @xref{Argp Help Flags}.
@@ -928,7 +928,7 @@ context other than parsing the program options, argp offers the
 
 @comment argp.h
 @comment GNU
-@deftypefun void argp_help (const struct argp *@var{argp}, @w{FILE *@var{stream}}, @w{unsigned @var{flags}}, @w{char *@var{name}})
+@deftypefun void argp_help (const struct argp *@var{argp}, FILE *@var{stream}, unsigned @var{flags}, char *@var{name})
 Output a help message for the argp parser @var{argp} to @var{stream}.
 What sort of messages is printed is determined by @var{flags}.
 
diff --git a/manual/socket.texi b/manual/socket.texi
index 0eab88a4b2..8ac5fa5b84 100644
--- a/manual/socket.texi
+++ b/manual/socket.texi
@@ -2040,7 +2040,7 @@ queue.
 
 @comment sys/socket.h
 @comment BSD
-@deftypefun int accept (int @var{socket}, struct sockaddr *@var{addr}, socklen_t *@var{length-ptr})
+@deftypefun int accept (int @var{socket}, struct sockaddr *@var{addr}, socklen_t *@var{length_ptr})
 This function is used to accept a connection request on the server
 socket @var{socket}.