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.
This commit is contained in:
Edward Hervey 2008-08-26 11:08:34 +00:00
parent e574c3e69d
commit c6486e2522
2 changed files with 13 additions and 5 deletions

View file

@ -1,3 +1,11 @@
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> 2008-08-26 Edward Hervey <edward.hervey@collabora.co.uk>
* gst/pcapparse/gstpcapparse.c: (gst_pcap_parse_class_init): * gst/pcapparse/gstpcapparse.c: (gst_pcap_parse_class_init):

View file

@ -118,7 +118,7 @@ gst_dccp_read_buffer (GstElement * this, int socket, GstBuffer ** buf)
*buf = gst_buffer_new_and_alloc (readsize); *buf = gst_buffer_new_and_alloc (readsize);
bytes_read = read (socket, GST_BUFFER_DATA (*buf), 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)); GST_LOG_OBJECT (this, "returning buffer of size %d", GST_BUFFER_SIZE (*buf));
return GST_FLOW_OK; 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); size = GST_BUFFER_SIZE (buffer);
data = GST_BUFFER_DATA (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) { if (packet_size < 0) {
GST_LOG_OBJECT (this, "error getting MTU\n"); GST_LOG_OBJECT (this, "error getting MTU");
return GST_FLOW_ERROR; 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. */ * since some OS's don't show the corrected value until then. */
rc = setsockopt (sock, SOL_DCCP, SO_RCVBUF, rc = setsockopt (sock, SOL_DCCP, SO_RCVBUF,
(char *) &winSize, sizeof (winSize)); (char *) &winSize, sizeof (winSize));
GST_DEBUG_OBJECT (element, "set rcv sockbuf: %d\n", winSize); GST_DEBUG_OBJECT (element, "set rcv sockbuf: %d", winSize);
} else { } else {
/* send buffer -- set /* send buffer -- set
* note: results are verified after connect() or listen(), * note: results are verified after connect() or listen(),
* since some OS's don't show the corrected value until then. */ * since some OS's don't show the corrected value until then. */
rc = setsockopt (sock, SOL_DCCP, SO_SNDBUF, rc = setsockopt (sock, SOL_DCCP, SO_SNDBUF,
(char *) &winSize, sizeof (winSize)); (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) { if (rc < 0) {