diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-01 16:25:41 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-10 08:14:11 -0700 |
| commit | b32156ab2b365b4210257d10d2fb7570d968ce2a (patch) | |
| tree | 96a47568d544098ab27bac8d4e48c7f3713f566f /glib/glib/giochannel.c | |
| parent | bde0ffb4446d75ac22bcb4c04d76d9da3fc3c33d (diff) | |
| download | pkg-config-b32156ab2b365b4210257d10d2fb7570d968ce2a.tar.gz | |
glib: Update snapshot to 2.32.2
A libelf pkg-config check creeped in, but it's only used in gio so we
can remove the libelf check completely.
Diffstat (limited to 'glib/glib/giochannel.c')
| -rw-r--r-- | glib/glib/giochannel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glib/glib/giochannel.c b/glib/glib/giochannel.c index f294701..32099f7 100644 --- a/glib/glib/giochannel.c +++ b/glib/glib/giochannel.c @@ -116,7 +116,7 @@ * various functions such as g_io_channel_write_chars() to * write raw bytes to the channel. Encoding and buffering * issues are dealt with at a higher level. - * @io_seek: (optional) seeks the channel. This is called from + * @io_seek: (optional) seeks the channel. This is called from * g_io_channel_seek() on channels that support it. * @io_close: closes the channel. This is called from * g_io_channel_close() after flushing the buffers. @@ -1653,8 +1653,8 @@ reencode: * 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. - * @length: location to store length of the read data, or %NULL - * @terminator_pos: location to store position of line terminator, or %NULL + * @length: (allow-none): location to store length of the read data, or %NULL + * @terminator_pos: (allow-none): location to store position of line terminator, or %NULL * @error: A location to return an error of type #GConvertError * or #GIOChannelError * @@ -1704,7 +1704,7 @@ g_io_channel_read_line (GIOChannel *channel, * @buffer: a #GString into which the line will be written. * If @buffer already contains data, the old data will * be overwritten. - * @terminator_pos: location to store position of line terminator, or %NULL + * @terminator_pos: (allow-none): location to store position of line terminator, or %NULL * @error: a location to store an error of type #GConvertError * or #GIOChannelError * |