[Libpdtp-svn] r42 - /

[<tar...@pd...>]

Author: tarcieri
Date: 2004-10-25 14:45:29 -0600 (Mon, 25 Oct 2004)
New Revision: 42

Modified:
   connection.c
   socketops.c
   socketops.h
Log:
const correctness fixes

Modified: connection.c
===================================================================
--- connection.c	2004-10-25 01:39:57 UTC (rev 41)
+++ connection.c	2004-10-25 20:45:29 UTC (rev 42)
@@ -95,7 +95,7 @@
 	if(pdtp__writesock_int16(sock, sizeof(hostname)) < 0)
 		goto err1;
 
-	if(pdtp__timeout_writesock(sock, hostname, sizeof(hostname)) < 0)
+	if(pdtp__writesock(sock, hostname, sizeof(hostname)) < 0)
 		goto err1;
 
 	connection = NEW(pdtp_connection);

Modified: socketops.c
===================================================================
--- socketops.c	2004-10-25 01:39:57 UTC (rev 41)
+++ socketops.c	2004-10-25 20:45:29 UTC (rev 42)
@@ -356,12 +356,12 @@
 	return 0;
 }
 
-ssize_t pdtp__atomic_writesock(pdtp_sock_t sock, void *buf, size_t nbytes)
+ssize_t pdtp__atomic_writesock(pdtp_sock_t sock, const void *buf, size_t nbytes)
 {
 	return send(sock, buf, nbytes, 0);
 }
 
-ssize_t pdtp__timeout_writesock(pdtp_sock_t sock, void *buf, size_t nbytes)
+ssize_t pdtp__timeout_writesock(pdtp_sock_t sock, const void *buf, size_t nbytes)
 {
 	fd_set fdset;
 	struct timeval tv;
@@ -380,10 +380,10 @@
 
 /* Write function.  This uses a loop to ensure the data is written completely,
    as the sockets involved will be set non-blocking */
-int pdtp__writesock(pdtp_sock_t sock, void *buf, size_t nbytes)
+int pdtp__writesock(pdtp_sock_t sock, const void *buf, size_t nbytes)
 {
 	ssize_t c;
-	uint8_t *bptr = buf;
+	uint8_t *bptr = (void *)buf;
 
 	while(nbytes > 0) {
 		if((c = pdtp__timeout_writesock(sock, bptr, nbytes)) < 1)

Modified: socketops.h
===================================================================
--- socketops.h	2004-10-25 01:39:57 UTC (rev 41)
+++ socketops.h	2004-10-25 20:45:29 UTC (rev 42)
@@ -37,9 +37,9 @@
 int pdtp__readsock_int16(pdtp_sock_t sock, uint16_t *value);
 int pdtp__readsock_int32(pdtp_sock_t sock, uint32_t *value);
 
-ssize_t pdtp__atomic_writesock(pdtp_sock_t sock, void *buf, size_t nbytes);
-ssize_t pdtp__timeout_writesock(pdtp_sock_t sock, void *buf, size_t nbytes);
-int pdtp__writesock(pdtp_sock_t sock, void *buf, size_t nbytes);
+ssize_t pdtp__atomic_writesock(pdtp_sock_t sock, const void *buf, size_t nbytes);
+ssize_t pdtp__timeout_writesock(pdtp_sock_t sock, const void *buf, size_t nbytes);
+int pdtp__writesock(pdtp_sock_t sock, const void *buf, size_t nbytes);
 int pdtp__writesock_int16(pdtp_sock_t sock, uint16_t value);
 int pdtp__writesock_int32(pdtp_sock_t sock, uint32_t value);