luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clarify that only one of the conditions listed in the docs need to be

Browse Source 
Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/giochannel.c (g_io_channel_set_encoding): Clarify
        that only one of the conditions listed in the docs
        need to be true, not all of them. (#87176,
        Sebastian Rittau)

        * glib/giochannel.c (g_io_channel_read_line): Fix
        description of the return value. (#87754, Manuel Clos)
This commit is contained in:
Owen Taylor 2002-07-25 23:15:41 +00:00 committed by Owen Taylor
parent 1d3b965d07
commit 46d1844845
8 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Thu Jul 25 19:12:43 2002 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_set_encoding): Clarify
that only one of the conditions listed in the docs
need to be true, not all of them. (#87176,
Sebastian Rittau)
* glib/giochannel.c (g_io_channel_read_line): Fix
description of the return value. (#87754, Manuel Clos)
Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com> Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_timeout_add): Remove reference * glib/gmain.c (g_timeout_add): Remove reference

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
Thu Jul 25 19:12:43 2002 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_set_encoding): Clarify
that only one of the conditions listed in the docs
need to be true, not all of them. (#87176,
Sebastian Rittau)
* glib/giochannel.c (g_io_channel_read_line): Fix
description of the return value. (#87754, Manuel Clos)
Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com> Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_timeout_add): Remove reference * glib/gmain.c (g_timeout_add): Remove reference

10
ChangeLog.pre-2-12
View File

@ -1,3 +1,13 @@
Thu Jul 25 19:12:43 2002 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_set_encoding): Clarify
that only one of the conditions listed in the docs
need to be true, not all of them. (#87176,
Sebastian Rittau)
* glib/giochannel.c (g_io_channel_read_line): Fix
description of the return value. (#87754, Manuel Clos)
Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com> Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_timeout_add): Remove reference * glib/gmain.c (g_timeout_add): Remove reference

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
Thu Jul 25 19:12:43 2002 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_set_encoding): Clarify
that only one of the conditions listed in the docs
need to be true, not all of them. (#87176,
Sebastian Rittau)
* glib/giochannel.c (g_io_channel_read_line): Fix
description of the return value. (#87754, Manuel Clos)
Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com> Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_timeout_add): Remove reference * glib/gmain.c (g_timeout_add): Remove reference

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
Thu Jul 25 19:12:43 2002 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_set_encoding): Clarify
that only one of the conditions listed in the docs
need to be true, not all of them. (#87176,
Sebastian Rittau)
* glib/giochannel.c (g_io_channel_read_line): Fix
description of the return value. (#87754, Manuel Clos)
Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com> Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_timeout_add): Remove reference * glib/gmain.c (g_timeout_add): Remove reference

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
Thu Jul 25 19:12:43 2002 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_set_encoding): Clarify
that only one of the conditions listed in the docs
need to be true, not all of them. (#87176,
Sebastian Rittau)
* glib/giochannel.c (g_io_channel_read_line): Fix
description of the return value. (#87754, Manuel Clos)
Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com> Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_timeout_add): Remove reference * glib/gmain.c (g_timeout_add): Remove reference

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
Thu Jul 25 19:12:43 2002 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_set_encoding): Clarify
that only one of the conditions listed in the docs
need to be true, not all of them. (#87176,
Sebastian Rittau)
* glib/giochannel.c (g_io_channel_read_line): Fix
description of the return value. (#87754, Manuel Clos)
Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com> Thu Jul 25 19:02:53 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_timeout_add): Remove reference * glib/gmain.c (g_timeout_add): Remove reference

12
glib/giochannel.c
View File

@ -1007,7 +1007,8 @@ g_io_channel_get_buffered (GIOChannel *channel)
* *
* The encoding %NULL is safe to use with binary data. * The encoding %NULL is safe to use with binary data.
* *
* The encoding can only be set under the following conditions: * The encoding can only be set if one of the following conditions
* is true:
* *
* 1. The channel was just created, and has not been written to * 1. The channel was just created, and has not been written to
* or read from yet. * or read from yet.
@ -1030,9 +1031,9 @@ g_io_channel_get_buffered (GIOChannel *channel)
* g_io_channel_read_line_string (), or g_io_channel_read_to_end () * g_io_channel_read_line_string (), or g_io_channel_read_to_end ()
* does <emphasis>not</emphasis> guarantee that the encoding can be changed. * does <emphasis>not</emphasis> guarantee that the encoding can be changed.
* *
* Channels which do not meet the above conditions cannot call * Channels which do not meet one of the above conditions cannot call
* g_io_channel_seek_position () with an offset of %G_SEEK_CUR, * g_io_channel_seek_position () with an offset of %G_SEEK_CUR,
* and if they are "seekable" cannot * and, if they are "seekable", cannot
* call g_io_channel_write_chars () after calling one * call g_io_channel_write_chars () after calling one
* of the API "read" functions. * of the API "read" functions.
* *
@ -1367,11 +1368,10 @@ reencode:
* *
* Reads a line, including the terminating character(s), * Reads a line, including the terminating character(s),
* from a #GIOChannel into a newly-allocated string. * from a #GIOChannel into a newly-allocated string.
* @length will contain allocated memory if the return * @str_return will contain allocated memory if the return
* is %G_IO_STATUS_NORMAL. * is %G_IO_STATUS_NORMAL.
* *
* Return value: a newly-allocated string. Free this string * Return value: the status of the operation.
* with g_free() when you are done with it.
**/ **/
GIOStatus GIOStatus
g_io_channel_read_line (GIOChannel *channel, g_io_channel_read_line (GIOChannel *channel,