Hi David, On Sat, Oct 15, 2011 at 3:16 AM, David Prévot <taffit@xxxxxxxxxx> wrote: > > Signed-off-by: David Prévot <taffit@xxxxxxxxxx> > --- > man3/mbsnrtowcs.3 | 2 +- > man3/mbsrtowcs.3 | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/man3/mbsnrtowcs.3 b/man3/mbsnrtowcs.3 > index bbd1d71..9a7a5bf 100644 > --- a/man3/mbsnrtowcs.3 > +++ b/man3/mbsnrtowcs.3 > @@ -80,7 +80,7 @@ next multibyte sequence to be converted, and the number of wide characters > written to \fIdest\fP is returned. > .IP 3. > The multibyte string has been completely converted, including the > -terminating null wide character (\(aq\\0\(aq) > +terminating wide character (\(aq\\0\(aq) > (which has the side effect of bringing back \fI*ps\fP to the > initial state). > In this case \fI*src\fP is set to NULL, and the number of wide > diff --git a/man3/mbsrtowcs.3 b/man3/mbsrtowcs.3 > index fcf47ca..fc8c802 100644 > --- a/man3/mbsrtowcs.3 > +++ b/man3/mbsrtowcs.3 > @@ -51,7 +51,7 @@ multibyte sequence to be converted, > and the number of wide characters written to \fIdest\fP is returned. > .IP 3. > The multibyte string has been completely converted, including the > -terminating null wide character (\(aq\\0\(aq), which has the side > +terminating null character (\(aq\\0\(aq), which has the side > effect of bringing back \fI*ps\fP to the > initial state. > In this case \fI*src\fP is set to NULL, and the number of wide This is one patch where I need some helpful explanation ;-). Your changes above seem inconsistent. In the first case, you remove "null", and in the second, you remove "wide". I suspect the first case is a mistake, and you meant in both cases to change "null wide" to "null", right? But, more generally, I think you are saying that there were some pieces of my older e9c23bc636426366d659809bc99cd84661e86464 that incorrectly changed "[terminating] null character" to "[terminating] null wide character", right? If that's the case, I suspect that there more than just those two errors. I suspect that the first of my changes to mbstowcs.3 below was also incorrect. Can you confirm? Cheers, Michael PS See also 3c81e148a228550b4ce3d20a9c68ce0eb91cef07, which I just pushed (to github). Do you agree with that change? --- a/man3/mbstowcs.3 +++ b/man3/mbstowcs.3 @@ -42,9 +42,9 @@ case the number of wide characters written to \fIdest\fP is re turned, but the shift state at this point is lost. .IP 3. The multibyte string has been completely converted, including the -terminating \(aq\\0\(aq. +terminating null wide character (\(aq\\0\(aq). In this case the number of wide characters written to -\fIdest\fP, excluding the terminating L\(aq\\0\(aq character, is returned. +\fIdest\fP, excluding the terminating null wide character, is returned. .PP The programmer must ensure that there is room for at least \fIn\fP wide characters at \fIdest\fP. -- Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Author of "The Linux Programming Interface"; http://man7.org/tlpi/ -- To unsubscribe from this list: send the line "unsubscribe linux-man" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
