diff options
author | Edward Hervey <bilboed@bilboed.com> | 2008-08-26 11:08:34 +0000 |
---|---|---|
committer | Edward Hervey <bilboed@bilboed.com> | 2008-08-26 11:08:34 +0000 |
commit | c6486e2522ee52855a88458fc84f5b73d141e9b6 (patch) | |
tree | 64f36831ae9067c6f6e6a46a6d76157ffedcc98d | |
parent | e574c3e69d4472bdf6a7d8ba2fdbfdc395d6da82 (diff) |
gst/dccp/gstdccp.c: size_t's size varies by platform/architecture. Use glib convenience macro instead. Fixes build on...
Original commit message from CVS:
* gst/dccp/gstdccp.c: (gst_dccp_read_buffer),
(gst_dccp_send_buffer), (gst_dccp_set_sock_windowsize):
size_t's size varies by platform/architecture. Use glib convenience
macro instead. Fixes build on macosx.
Remove ending '\n' in debug statements.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | gst/dccp/gstdccp.c | 10 |
2 files changed, 13 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2008-08-26 Edward Hervey <edward.hervey@collabora.co.uk> + * gst/dccp/gstdccp.c: (gst_dccp_read_buffer), + (gst_dccp_send_buffer), (gst_dccp_set_sock_windowsize): + size_t's size varies by platform/architecture. Use glib convenience + macro instead. Fixes build on macosx. + Remove ending '\n' in debug statements. + +2008-08-26 Edward Hervey <edward.hervey@collabora.co.uk> + * gst/pcapparse/gstpcapparse.c: (gst_pcap_parse_class_init): Remove unused code and fix includes. diff --git a/gst/dccp/gstdccp.c b/gst/dccp/gstdccp.c index a53af7dc8..c29d5f42f 100644 --- a/gst/dccp/gstdccp.c +++ b/gst/dccp/gstdccp.c @@ -118,7 +118,7 @@ gst_dccp_read_buffer (GstElement * this, int socket, GstBuffer ** buf) *buf = gst_buffer_new_and_alloc (readsize); bytes_read = read (socket, GST_BUFFER_DATA (*buf), readsize); - GST_LOG_OBJECT (this, "bytes read %d\n", bytes_read); + GST_LOG_OBJECT (this, "bytes read %" G_GSIZE_FORMAT, bytes_read); GST_LOG_OBJECT (this, "returning buffer of size %d", GST_BUFFER_SIZE (*buf)); return GST_FLOW_OK; @@ -285,10 +285,10 @@ gst_dccp_send_buffer (GstElement * this, GstBuffer * buffer, int client_sock_fd, size = GST_BUFFER_SIZE (buffer); data = GST_BUFFER_DATA (buffer); - GST_LOG_OBJECT (this, "writing %d bytes\n", size); + GST_LOG_OBJECT (this, "writing %" G_GSIZE_FORMAT " bytes", size); if (packet_size < 0) { - GST_LOG_OBJECT (this, "error getting MTU\n"); + GST_LOG_OBJECT (this, "error getting MTU"); return GST_FLOW_ERROR; } @@ -429,14 +429,14 @@ gst_dccp_set_sock_windowsize (GstElement * element, int sock, int winSize, * since some OS's don't show the corrected value until then. */ rc = setsockopt (sock, SOL_DCCP, SO_RCVBUF, (char *) &winSize, sizeof (winSize)); - GST_DEBUG_OBJECT (element, "set rcv sockbuf: %d\n", winSize); + GST_DEBUG_OBJECT (element, "set rcv sockbuf: %d", winSize); } else { /* send buffer -- set * note: results are verified after connect() or listen(), * since some OS's don't show the corrected value until then. */ rc = setsockopt (sock, SOL_DCCP, SO_SNDBUF, (char *) &winSize, sizeof (winSize)); - GST_DEBUG_OBJECT (element, "set snd sockbuf: %d\n", winSize); + GST_DEBUG_OBJECT (element, "set snd sockbuf: %d", winSize); } if (rc < 0) { |