* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
* @include: gio/gio.h
* @see_also: #GOutputStream, #GFileDescriptorBased, #GPollableInputStream
*
- * #GPollableOutputStream is implemented by #GOutputStream<!-- -->s that
+ * #GPollableOutputStream is implemented by #GOutputStreams that
* can be polled for readiness to write. This can be used when
* interfacing with a non-GIO API that expects
* UNIX-file-descriptor-style asynchronous I/O rather than GIO-style.
static gboolean g_pollable_output_stream_default_can_poll (GPollableOutputStream *stream);
static gssize g_pollable_output_stream_default_write_nonblocking (GPollableOutputStream *stream,
const void *buffer,
- gsize size,
+ gsize count,
GError **error);
static void
}
/**
- * g_pollable_output_stream_create_source: (skip)
+ * g_pollable_output_stream_create_source:
* @stream: a #GPollableOutputStream.
* @cancellable: (allow-none): a #GCancellable, or %NULL
*
static gssize
g_pollable_output_stream_default_write_nonblocking (GPollableOutputStream *stream,
const void *buffer,
- gsize size,
+ gsize count,
GError **error)
{
if (!g_pollable_output_stream_is_writable (stream))
return -1;
}
- return g_output_stream_write (G_OUTPUT_STREAM (stream), buffer, size,
- NULL, error);
+ return G_OUTPUT_STREAM_GET_CLASS (stream)->
+ write_fn (G_OUTPUT_STREAM (stream), buffer, count, NULL, error);
}
/**
* g_pollable_output_stream_write_nonblocking:
* @stream: a #GPollableOutputStream
- * @buffer: (array length=size) (element-type guint8): a buffer to write
+ * @buffer: (array length=count) (element-type guint8): a buffer to write
* data from
- * @size: the number of bytes you want to write
+ * @count: the number of bytes you want to write
* @cancellable: (allow-none): a #GCancellable, or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
- * Attempts to write up to @size bytes from @buffer to @stream, as
+ * Attempts to write up to @count bytes from @buffer to @stream, as
* with g_output_stream_write(). If @stream is not currently writable,
* this will immediately return %G_IO_ERROR_WOULD_BLOCK, and you can
* use g_pollable_output_stream_create_source() to create a #GSource
* to having been cancelled.
*
* Virtual: write_nonblocking
- * Return value: the number of bytes written, or -1 on error (including
+ * Returns: the number of bytes written, or -1 on error (including
* %G_IO_ERROR_WOULD_BLOCK).
*/
gssize
g_pollable_output_stream_write_nonblocking (GPollableOutputStream *stream,
const void *buffer,
- gsize size,
+ gsize count,
GCancellable *cancellable,
GError **error)
{
+ gssize res;
+
g_return_val_if_fail (G_IS_POLLABLE_OUTPUT_STREAM (stream), -1);
+ g_return_val_if_fail (buffer != NULL, 0);
if (g_cancellable_set_error_if_cancelled (cancellable, error))
return -1;
- return G_POLLABLE_OUTPUT_STREAM_GET_INTERFACE (stream)->
- write_nonblocking (stream, buffer, size, error);
+ if (count == 0)
+ return 0;
+
+ if (((gssize) count) < 0)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
+ _("Too large count value passed to %s"), G_STRFUNC);
+ return -1;
+ }
+
+ if (cancellable)
+ g_cancellable_push_current (cancellable);
+
+ res = G_POLLABLE_OUTPUT_STREAM_GET_INTERFACE (stream)->
+ write_nonblocking (stream, buffer, count, error);
+
+ if (cancellable)
+ g_cancellable_pop_current (cancellable);
+
+ return res;
}