merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 36326fb43addc493110e0d0e41e02edd650450b3..30e4b4ee87c21ff8edb7252c9252576ed5abb23e 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-23  DJ Delorie  <dj@redhat.com>
+
+       * argv.c (writeargv): Fix typo in inline documentation.
+       * functions.texi: Regenerate.
+
 2007-07-17  DJ Delorie  <dj@redhat.com>
 
        * configure.ac (target_header_dir, msdosdjgpp): Remove duplicate

diff --git a/libiberty/argv.c b/libiberty/argv.c
index faeb72de4487e445cbe8a8b979a0be82fbcb91ca..38bd4497090b6cb5ad56004b87ba24cd6c866459 100644 (file)
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -290,7 +290,7 @@ char **buildargv (const char *input)
 
 /*
 
-@deftypefn Extension int writeargv (const char **@var{argv}, FILE *@{file})
+@deftypefn Extension int writeargv (const char **@var{argv}, FILE *@var{file})
 
 Write each member of ARGV, handling all necessary quoting, to the file
 named by FILE, separated by whitespace.  Return 0 on success, non-zero

diff --git a/libiberty/functions.texi b/libiberty/functions.texi
index fd3e8e74ea7b17565dfa00aadf3726071c6f9c2c..e6ab84c69990b75c84dfa83d3167dcb84484f1ad 100644 (file)
--- a/libiberty/functions.texi
+++ b/libiberty/functions.texi
@@ -214,7 +214,7 @@ symbolic name or message.
 
 @end deftypefn
 
-@c argv.c:293
+@c argv.c:348
 @deftypefn Extension void expandargv (int *@var{argcp}, char ***@var{argvp})
 
 The @var{argcp} and @code{argvp} arguments are pointers to the usual
@@ -268,15 +268,16 @@ value 1).  If @var{valu} is zero, zero is returned.
 
 @end deftypefn
 
-@c filename_cmp.c:28
+@c filename_cmp.c:32
 @deftypefn Extension int filename_cmp (const char *@var{s1}, const char *@var{s2})
 
-Return zero if the two paths @var{s1} and @var{s2} are equivalent.
-If not equivalent, the returned value is similar to what strcmp would
-return.  In other words, it returns a negative value if @var{s1} is less
-than @var{s2}, or a positive value if @var{s2} is greater than @var{s2}.
+Return zero if the two file names @var{s1} and @var{s2} are equivalent.
+If not equivalent, the returned value is similar to what @code{strcmp}
+would return.  In other words, it returns a negative value if @var{s1}
+is less than @var{s2}, or a positive value if @var{s2} is greater than
+@var{s2}.
 
-This function does not normalize path names. As a result, this function
+This function does not normalize file names.  As a result, this function
 will treat filenames that are spelled differently as different even in
 the case when the two filenames point to the same underlying file.
 However, it does handle the fact that on DOS-like file systems, forward
@@ -1471,6 +1472,15 @@ does the return value.  The third argument is unused in @libib{}.
 
 @end deftypefn
 
+@c argv.c:293
+@deftypefn Extension int writeargv (const char **@var{argv}, FILE *@var{file})
+
+Write each member of ARGV, handling all necessary quoting, to the file
+named by FILE, separated by whitespace.  Return 0 on success, non-zero
+if an error occurred while writing to FILE.
+
+@end deftypefn
+
 @c xatexit.c:11
 @deftypefun int xatexit (void (*@var{fn}) (void))