From 289ad03afd6c99a677973b1d21b953bbc831de67 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 26 Jul 2002 00:59:07 +0000 Subject: [PATCH] Fix docs for @str_return to conform to the main docs and the Thu Jul 25 20:57:20 2002 Owen Taylor * glib/giochannel.c (g_io_channel_read_line): Fix docs for @str_return to conform to the main docs and the implementation as to whether the terminator is included. (#87964, Jacob Berkman) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ glib/giochannel.c | 2 +- 8 files changed, 50 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2094ba7bb..452687a6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jul 25 20:57:20 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_read_line): Fix + docs for @str_return to conform to the main docs + and the implementation as to whether the terminator + is included. (#87964, Jacob Berkman) + Thu Jul 25 19:52:41 2002 Owen Taylor * glib/guniprop.c (real_tolower): Handle the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2094ba7bb..452687a6d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Jul 25 20:57:20 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_read_line): Fix + docs for @str_return to conform to the main docs + and the implementation as to whether the terminator + is included. (#87964, Jacob Berkman) + Thu Jul 25 19:52:41 2002 Owen Taylor * glib/guniprop.c (real_tolower): Handle the diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2094ba7bb..452687a6d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Thu Jul 25 20:57:20 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_read_line): Fix + docs for @str_return to conform to the main docs + and the implementation as to whether the terminator + is included. (#87964, Jacob Berkman) + Thu Jul 25 19:52:41 2002 Owen Taylor * glib/guniprop.c (real_tolower): Handle the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2094ba7bb..452687a6d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Thu Jul 25 20:57:20 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_read_line): Fix + docs for @str_return to conform to the main docs + and the implementation as to whether the terminator + is included. (#87964, Jacob Berkman) + Thu Jul 25 19:52:41 2002 Owen Taylor * glib/guniprop.c (real_tolower): Handle the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2094ba7bb..452687a6d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Thu Jul 25 20:57:20 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_read_line): Fix + docs for @str_return to conform to the main docs + and the implementation as to whether the terminator + is included. (#87964, Jacob Berkman) + Thu Jul 25 19:52:41 2002 Owen Taylor * glib/guniprop.c (real_tolower): Handle the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2094ba7bb..452687a6d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Jul 25 20:57:20 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_read_line): Fix + docs for @str_return to conform to the main docs + and the implementation as to whether the terminator + is included. (#87964, Jacob Berkman) + Thu Jul 25 19:52:41 2002 Owen Taylor * glib/guniprop.c (real_tolower): Handle the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2094ba7bb..452687a6d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Jul 25 20:57:20 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_read_line): Fix + docs for @str_return to conform to the main docs + and the implementation as to whether the terminator + is included. (#87964, Jacob Berkman) + Thu Jul 25 19:52:41 2002 Owen Taylor * glib/guniprop.c (real_tolower): Handle the diff --git a/glib/giochannel.c b/glib/giochannel.c index 2c229f61e..5c198764c 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -1357,7 +1357,7 @@ reencode: /** * g_io_channel_read_line: * @channel: a #GIOChannel - * @str_return: The line read from the #GIOChannel, not including the + * @str_return: The line read from the #GIOChannel, including the * line terminator. This data should be freed with g_free() * when no longer needed. This is a nul-terminated string. * If a @length of zero is returned, this will be %NULL instead.