[svn:parrot] r37735 - trunk/src/io

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Thu Mar 26 02:44:57 2009
New Revision: 37735
URL: https://trac.parrot.org/parrot/changeset/37735

Log:
Applying patch pasted by bacek++ to bring file into conformance with coding standard without breaking build.

Modified:
   trunk/src/io/socket_unix.c
   trunk/src/io/socket_win32.c

Modified: trunk/src/io/socket_unix.c
==============================================================================
--- trunk/src/io/socket_unix.c	Thu Mar 26 02:24:29 2009	(r37734)
+++ trunk/src/io/socket_unix.c	Thu Mar 26 02:44:57 2009	(r37735)
@@ -88,7 +88,10 @@
 */
 
 /* Helper macros to get sockaddr_in */
-#  define SOCKADDR(p, t) ((struct sockaddr_in*)VTABLE_get_pointer(interp, PARROT_SOCKET((p))->t))
+#  define SOCKADDR_LOCAL(p) ((struct sockaddr_in*)VTABLE_get_pointer(interp, \
+                PARROT_SOCKET((p))->local))
+#  define SOCKADDR_REMOTE(p) ((struct sockaddr_in*)VTABLE_get_pointer(interp, \
+                PARROT_SOCKET((p))->remote))
 
 
 PARROT_WARN_UNUSED_RESULT
@@ -133,7 +136,7 @@
         PMC * io = Parrot_io_new_socket_pmc(interp, PIO_F_SOCKET|PIO_F_READ|PIO_F_WRITE);
         PARROT_SOCKET(io)->os_handle = sock;
         setsockopt(PARROT_SOCKET(io)->os_handle, SOL_SOCKET, SO_REUSEADDR, &i, sizeof (i));
-        SOCKADDR(io, remote)->sin_family = fam;
+        SOCKADDR_REMOTE(io)->sin_family = fam;
         return io;
     }
     return PMCNULL;
@@ -161,7 +164,7 @@
     PARROT_SOCKET(socket)->remote = r;
 
 AGAIN:
-    if ((connect(io->os_handle, (struct sockaddr *)SOCKADDR(socket, remote),
+    if ((connect(io->os_handle, (struct sockaddr *)SOCKADDR_REMOTE(socket),
             sizeof (struct sockaddr_in))) != 0) {
         switch (errno) {
             case EINTR:
@@ -200,7 +203,7 @@
 
     PARROT_SOCKET(socket)->local = sockaddr;
 
-    saddr = SOCKADDR(socket, local);
+    saddr = SOCKADDR_LOCAL(socket);
 
     if ((bind(io->os_handle, (struct sockaddr *) saddr,
             sizeof (struct sockaddr_in))) == -1) {
@@ -257,7 +260,7 @@
 
     PARROT_SOCKET(newio)->local  = PARROT_SOCKET(socket)->local;
     PARROT_SOCKET(newio)->remote = pmc_new(interp, enum_class_Sockaddr);
-    saddr                        = SOCKADDR(newio, remote);
+    saddr                        = SOCKADDR_REMOTE(newio);
 
     newsock = accept(io->os_handle, (struct sockaddr *)saddr, &addrlen);
 

Modified: trunk/src/io/socket_win32.c
==============================================================================
--- trunk/src/io/socket_win32.c	Thu Mar 26 02:24:29 2009	(r37734)
+++ trunk/src/io/socket_win32.c	Thu Mar 26 02:44:57 2009	(r37735)
@@ -54,7 +54,10 @@
 #  if PARROT_NET_DEVEL
 
 /* Helper macros to get sockaddr_in */
-#    define SOCKADDR(p, t) ((struct sockaddr_in*)VTABLE_get_pointer(interp, PARROT_SOCKET((p))->t))
+#    define SOCKADDR_LOCAL(p) ((struct sockaddr_in*)VTABLE_get_pointer(interp, \
+                PARROT_SOCKET((p))->local))
+#    define SOCKADDR_REMOTE(p) ((struct sockaddr_in*)VTABLE_get_pointer(interp, \
+                PARROT_SOCKET((p))->remote))
 
 /*
 
@@ -79,7 +82,7 @@
         PMC * io = Parrot_io_new_socket_pmc(interp, PIO_F_SOCKET|PIO_F_READ|PIO_F_WRITE);
         PARROT_SOCKET(io)->os_handle = (void*)sock;
         setsockopt((int)PARROT_SOCKET(io)->os_handle, SOL_SOCKET, SO_REUSEADDR, &i, sizeof (i));
-        SOCKADDR(io, remote)->sin_family = fam;
+        SOCKADDR_REMOTE(io)->sin_family = fam;
         return io;
     }
     return PMCNULL;
@@ -107,7 +110,7 @@
     PARROT_SOCKET(socket)->remote = r;
 
 AGAIN:
-    if ((connect((int)io->os_handle, (struct sockaddr *)SOCKADDR(socket, remote),
+    if ((connect((int)io->os_handle, (struct sockaddr *)SOCKADDR_REMOTE(socket),
             sizeof (struct sockaddr_in))) != 0) {
         switch (errno) {
             case WSAEINTR:
@@ -146,7 +149,7 @@
 
     PARROT_SOCKET(socket)->local = sockaddr;
 
-    saddr = SOCKADDR(socket, local);
+    saddr = SOCKADDR_LOCAL(socket);
 
     if ((bind((int)io->os_handle, (struct sockaddr *) saddr,
             sizeof (struct sockaddr_in))) == -1) {
@@ -203,7 +206,7 @@
 
     PARROT_SOCKET(newio)->local  = PARROT_SOCKET(socket)->local;
     PARROT_SOCKET(newio)->remote = pmc_new(interp, enum_class_Sockaddr);
-    saddr                        = SOCKADDR(newio, remote);
+    saddr                        = SOCKADDR_REMOTE(newio);
 
     newsock = accept((int)io->os_handle, (struct sockaddr *)saddr, &addrlen);