indentation/whitespace/curlies

iemnet.c

@@ -38,7 +38,7 @@ void iemnet__closesocket(int sockfd, int verbose)
 # define SHUT_RDWR 2
 #endif
     int how = SHUT_RDWR;
-     /* needed on linux, since the recv won't shutdown on sys_closesocket() alone */
+    /* needed on linux, since the recv won't shutdown on sys_closesocket() alone */
     int err = shutdown(sockfd, how);
     if(verbose && err) {
       perror("iemnet:socket-shutdown");
@@ -47,7 +47,8 @@ void iemnet__closesocket(int sockfd, int verbose)
   }
 }
 
-int iemnet__sockaddr2list(const struct sockaddr_storage*address, t_atom alist[18]) {
+int iemnet__sockaddr2list(const struct sockaddr_storage*address, t_atom alist[18])
+{
   switch (address->ss_family) {
   case AF_INET: {
     struct sockaddr_in*addr = (struct sockaddr_in*)address;
@@ -66,8 +67,9 @@ int iemnet__sockaddr2list(const struct sockaddr_storage*address, t_atom alist[18
     uint8_t*ipaddr = addr->sin6_addr.s6_addr;
     unsigned int i;
     SETSYMBOL(alist+0, gensym("IPv6"));
-    for(i = 0; i<16; i++)
+    for(i = 0; i<16; i++) {
       SETFLOAT(alist+i+1, ipaddr[i]);
+    }
     SETFLOAT(alist+17, ntohs(addr->sin6_port));
     return 18;
   }
@@ -88,7 +90,8 @@ int iemnet__sockaddr2list(const struct sockaddr_storage*address, t_atom alist[18
 }
 
 
-void iemnet__socket2addressout(int sockfd, t_outlet*status_outlet, t_symbol*s) {
+void iemnet__socket2addressout(int sockfd, t_outlet*status_outlet, t_symbol*s)
+{
   struct sockaddr_storage address;
   socklen_t addresssize = sizeof(address);
   t_atom alist[18];
@@ -126,7 +129,7 @@ void iemnet__addrout(t_outlet*status_outlet, t_outlet*address_outlet,
   addr[4].a_w.w_float = port;
 
   if(status_outlet ) {
-    outlet_anything(status_outlet , gensym("address"), 5, addr);
+    outlet_anything(status_outlet, gensym("address"), 5, addr);
   }
   if(address_outlet) {
     outlet_list(address_outlet, gensym("list"   ), 5, addr);
@@ -140,7 +143,7 @@ void iemnet__numconnout(t_outlet*status_outlet, t_outlet*numcon_outlet,
   SETFLOAT(atom, numconnections);
 
   if(status_outlet) {
-    outlet_anything(status_outlet , gensym("connections"), 1, atom);
+    outlet_anything(status_outlet, gensym("connections"), 1, atom);
   }
   if(numcon_outlet) {
     outlet_float(numcon_outlet, numconnections);
@@ -154,7 +157,7 @@ void iemnet__socketout(t_outlet*status_outlet, t_outlet*socket_outlet,
   SETFLOAT(atom, socketfd);
 
   if(status_outlet) {
-    outlet_anything(status_outlet , gensym("socket"), 1, atom);
+    outlet_anything(status_outlet, gensym("socket"), 1, atom);
   }
   if(socket_outlet) {
     outlet_float(socket_outlet, socketfd);

iemnet_data.c

@@ -520,10 +520,10 @@ t_iemnet_queue* queue_create(void)
   q->tail = NULL;
 
   memcpy(&q->cond, &cond, sizeof(pthread_cond_t));
-  memcpy(&q->mtx , &mtx, sizeof(pthread_mutex_t));
+  memcpy(&q->mtx, &mtx, sizeof(pthread_mutex_t));
 
   memcpy(&q->usedcond, &cond, sizeof(pthread_cond_t));
-  memcpy(&q->usedmtx , &mtx, sizeof(pthread_mutex_t));
+  memcpy(&q->usedmtx, &mtx, sizeof(pthread_mutex_t));
 
   q->done = 0;
   q->size = 0;

iemnet_receiver.c

@@ -57,8 +57,10 @@ static void pollfun(void*z, int fd)
   recv_flags |= MSG_DONTWAIT;
 #endif
   errno = 0;
-  if(fd != rec->sockfd)
-    DEBUG("%s(%p, %d) receives from %d\n", __FUNCTION__, rec, fd, rec->sockfd);
+  if(fd != rec->sockfd) {
+    DEBUG("%s(%p, %d) receives from %d\n", __FUNCTION__, rec, fd,
+          rec->sockfd);
+  }
 
   result = recvfrom(rec->sockfd, (void *)data, size, recv_flags,
                     (struct sockaddr *)&from, &fromlen);

iemnet_sender.c

@@ -229,7 +229,7 @@ t_iemnet_sender*iemnet__sender_create(int sock,
 {
   static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
   t_iemnet_sender*result = (t_iemnet_sender*)calloc(1,
-                         sizeof(t_iemnet_sender));
+                           sizeof(t_iemnet_sender));
   int res = 0;
   DEBUG("create sender %x in%sthread", result,subthread?"sub":"main ");
   if(NULL == result) {
@@ -245,8 +245,9 @@ t_iemnet_sender*iemnet__sender_create(int sock,
   result->userdata = userdata;
   DEBUG("create_sender queue = %x", result->queue);
 
-  memcpy(&result->mtx , &mtx, sizeof(pthread_mutex_t));
-  res = pthread_create(&result->thread, 0, iemnet__sender_sendthread, result);
+  memcpy(&result->mtx, &mtx, sizeof(pthread_mutex_t));
+  res = pthread_create(&result->thread, 0, iemnet__sender_sendthread,
+                       result);
 
   if(0 == res) {
   } else {
@@ -277,7 +278,7 @@ int iemnet__sender_getsockopt(t_iemnet_sender*s, int level, int optname,
   int result = getsockopt(s->sockfd, level, optname, optval, optlen);
   if(result != 0) {
     pd_error(0, "iemnet::sender: getsockopt returned %d",
-         iemnet__sender_getlasterror(s));
+             iemnet__sender_getlasterror(s));
   }
   return result;
 }
@@ -287,7 +288,7 @@ int iemnet__sender_setsockopt(t_iemnet_sender*s, int level, int optname,
   int result = setsockopt(s->sockfd, level, optname, optval, optlen);
   if(result != 0) {
     pd_error(0, "iemnet::sender: setsockopt returned %d",
-         iemnet__sender_getlasterror(s));
+             iemnet__sender_getlasterror(s));
   }
   return result;
 }
@@ -309,22 +310,26 @@ int iemnet__sender_getsize(t_iemnet_sender*x)
 static int sock_set_nonblocking(int socket, int nonblocking)
 {
 #ifdef _WIN32
-    u_long modearg = nonblocking;
-    if (ioctlsocket(socket, FIONBIO, &modearg) != NO_ERROR)
-        return -1;
+  u_long modearg = nonblocking;
+  if (ioctlsocket(socket, FIONBIO, &modearg) != NO_ERROR) {
+    return -1;
+  }
 #else
-    int sockflags = fcntl(socket, F_GETFL, 0);
-    if (nonblocking)
-        sockflags |= O_NONBLOCK;
-    else
-        sockflags &= ~O_NONBLOCK;
-    if (fcntl(socket, F_SETFL, sockflags) < 0)
-        return -1;
+  int sockflags = fcntl(socket, F_GETFL, 0);
+  if (nonblocking) {
+    sockflags |= O_NONBLOCK;
+  } else {
+    sockflags &= ~O_NONBLOCK;
+  }
+  if (fcntl(socket, F_SETFL, sockflags) < 0) {
+    return -1;
+  }
 #endif
-    return 0;
+  return 0;
 }
 
-static int conn_in_progress() {
+static int conn_in_progress()
+{
 #ifdef _WIN32
   return (WSAGetLastError() == WSAEWOULDBLOCK);
 #else
@@ -333,7 +338,9 @@ static int conn_in_progress() {
 }
 
 
-int iemnet__connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen, float timeout) {
+int iemnet__connect(int sockfd, const struct sockaddr *addr,
+                    socklen_t addrlen, float timeout)
+{
   if(timeout<0) {
     return connect(sockfd, addr, addrlen);
   }
@@ -342,11 +349,14 @@ int iemnet__connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen,
     int status;
     struct timeval timeoutval;
     fd_set writefds, errfds;
-    if (!conn_in_progress())
-        return -1; // break on "real" error
+    if (!conn_in_progress()) {
+      return -1;  // break on "real" error
+    }
 
     // block with select using timeout
-    if (timeout < 0) timeout = 0;
+    if (timeout < 0) {
+      timeout = 0;
+    }
     timeout *= 0.001; /* seconds -> ms */
     timeoutval.tv_sec = (int)timeout;
     timeoutval.tv_usec = (timeout - timeoutval.tv_sec) * 1000000;
@@ -356,13 +366,10 @@ int iemnet__connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen,
     FD_SET(sockfd, &errfds); // catch exceptions
 
     status = select(sockfd+1, NULL, &writefds, &errfds, &timeoutval);
-    if (status < 0) // select failed
-    {
+    if (status < 0) { // select failed
       fprintf(stderr, "socket_connect: select failed");
       return -1;
-    }
-    else if (status == 0) // connection timed out
-    {
+    } else if (status == 0) { // connection timed out
 #ifdef _WIN32
       WSASetLastError(WSAETIMEDOUT);
 #else
@@ -371,9 +378,9 @@ int iemnet__connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen,
       return -1;
     }
 
-    if (FD_ISSET(sockfd, &errfds)) // connection failed
-    {
-      int err; socklen_t len = sizeof(err);
+    if (FD_ISSET(sockfd, &errfds)) { // connection failed
+      int err;
+      socklen_t len = sizeof(err);
       getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (void *)&err, &len);
 #ifdef _WIN32
       WSASetLastError(err);

tcpclient.c

@@ -68,8 +68,10 @@ static void tcpclient_info(t_tcpclient *x)
   static t_atom output_atom[3];
   int connected = x->x_connectstate;
   int sockfd = x->x_fd;
-  if(sockfd >= 0)
-    iemnet__socket2addressout(sockfd, x->x_statusout, gensym("local_address"));
+  if(sockfd >= 0) {
+    iemnet__socket2addressout(sockfd, x->x_statusout,
+                              gensym("local_address"));
+  }
   iemnet__numconnout(x->x_statusout, x->x_connectout, connected);
   if(connected) {
     unsigned short port = x->x_port;
@@ -148,7 +150,7 @@ static int tcpclient_do_connect(const char*host, unsigned short port,
 
   sender = iemnet__sender_create(sockfd, NULL, NULL, 0);
   receiver = iemnet__receiver_create(sockfd, x, tcpclient_receive_callback,
-                                   0);
+                                     0);
   if(addrOUT) {
     *addrOUT = ntohl(*(long *)hp->h_addr);
   }
@@ -191,8 +193,8 @@ static void tcpclient_connect(t_tcpclient *x, t_symbol *hostname,
   x->x_port = fportno;
 
   state = tcpclient_do_connect(x->x_hostname, x->x_port, x,
-                             &x->x_sender, &x->x_receiver,
-                             &x->x_addr);
+                               &x->x_sender, &x->x_receiver,
+                               &x->x_addr);
   x->x_connectstate = (state>0);
   x->x_fd = state;
   tcpclient_info(x);
@@ -245,7 +247,7 @@ static void tcpclient_receive_callback(void*y, t_iemnet_chunk*c)
 
   if(c) {
     iemnet__addrout(x->x_statusout, x->x_addrout, x->x_addr, x->x_port);
-     /* get's destroyed in the dtor */
+    /* get's destroyed in the dtor */
     x->x_floatlist = iemnet__chunk2list(c, x->x_floatlist);
     iemnet__streamout(x->x_msgout, x->x_floatlist->argc, x->x_floatlist->argv,
                       x->x_serialize);

tcpreceive.c

@@ -116,7 +116,7 @@ static int tcpreceive_addconnection(t_tcpreceive *x, int fd, long addr,
       x->x_connection[i].addr = addr;
       x->x_connection[i].port = port;
       x->x_connection[i].owner = x;
-      x->x_connection[i].receiver = 
+      x->x_connection[i].receiver =
         iemnet__receiver_create(fd,
                                 x->x_connection+i,
                                 tcpreceive_read_callback,

tcpserver.c

@@ -123,7 +123,7 @@ static t_tcpserver_event tcpserver_info_event(t_tcpserver *x, t_tcpserver_event
 
 
 static t_tcpserver_socketreceiver *tcpserver_socketreceiver_new(
-    t_tcpserver *owner, int sockfd, struct sockaddr_in*addr, unsigned int client)
+  t_tcpserver *owner, int sockfd, struct sockaddr_in*addr, unsigned int client)
 {
   t_tcpserver_socketreceiver *x = (t_tcpserver_socketreceiver *)getbytes(sizeof(*x));
   long address;
@@ -611,7 +611,7 @@ static void tcpserver_connectpoll(t_tcpserver *x, int fd)
   fd = accept(fd, (struct sockaddr*)&incomer_address, &sockaddrl);
 
   tcpserver_info_event(x, CONNECT);
-    if (fd < 0) {
+  if (fd < 0) {
     post("%s: accept failed", objName);
   } else if(!x->x_accepting) {
     iemnet__closesocket(fd, 1);
@@ -724,8 +724,8 @@ static void tcpserver_port(t_tcpserver*x, t_floatarg fportno)
     outlet_anything(x->x_statusout, gensym("port"), 1, ap);
     return;
   } else {
-      /* wait for new connections */
-      sys_addpollfn(sockfd, (t_fdpollfn)tcpserver_connectpoll, x);
+    /* wait for new connections */
+    sys_addpollfn(sockfd, (t_fdpollfn)tcpserver_connectpoll, x);
   }
 
   x->x_connectsocket = sockfd;
@@ -762,8 +762,9 @@ static void tcpserver_maxconnections(t_tcpserver *x, t_floatarg maxconnf)
     pd_error(x, "maximum number of connections < number of currently connected clients [%d]", x->x_nconnections);
     return;
   }
-  if(maxconn == x->x_maxconnections)
+  if(maxconn == x->x_maxconnections) {
     return;
+  }
 
   sr = resizebytes(x->x_sr
       , sizeof(*sr) * x->x_maxconnections
@@ -789,7 +790,7 @@ static void *tcpserver_new(t_floatarg fportno)
   x->x_sockout = outlet_new(&x->x_obj, gensym("float"));
   x->x_addrout = outlet_new(&x->x_obj, gensym("list" ));
   x->x_statusout = outlet_new(&x->x_obj,
-                            0);/* 5th outlet for everything else */
+                              0);/* 5th outlet for everything else */
 
   x->x_serialize = 1;
   x->x_accepting = 1;

udpclient.c

@@ -68,8 +68,9 @@ static void udpclient_info(t_udpclient *x)
   static t_atom output_atom[3];
   int connected = x->x_connectstate;
   int sockfd = x->x_fd;
-  if(sockfd >= 0)
+  if(sockfd >= 0) {
     iemnet__socket2addressout(sockfd, x->x_statusout, gensym("local_address"));
+  }
   iemnet__numconnout(x->x_statusout, x->x_connectout, x->x_connectstate);
   if(connected) {
     unsigned short port = x->x_port;
@@ -157,7 +158,7 @@ static void *udpclient_doconnect(t_udpclient*x, int subthread)
 
   x->x_sender = iemnet__sender_create(sockfd, NULL, NULL, subthread);
   x->x_receiver = iemnet__receiver_create(sockfd, x,
-                                        udpclient_receive_callback, subthread);
+                                          udpclient_receive_callback, subthread);
 
   x->x_connectstate = 1;
   udpclient_info(x);
@@ -184,7 +185,8 @@ static int udpclient_do_disconnect(t_udpclient *x)
   x->x_fd = -1;
   return 1;
 }
-static void udpclient_disconnect(t_udpclient *x) {
+static void udpclient_disconnect(t_udpclient *x)
+{
   if(!udpclient_do_disconnect(x)) {
     iemnet_log(x, IEMNET_ERROR, "not connected");
   } else {
@@ -194,7 +196,7 @@ static void udpclient_disconnect(t_udpclient *x) {
 
 static void udpclient_connect(t_udpclient *x, t_symbol *hostname,
                               t_floatarg fportno,
-			      t_floatarg fsndportno)
+                              t_floatarg fsndportno)
 {
   if(x->x_fd >= 0) {
     udpclient_disconnect(x);
@@ -235,7 +237,7 @@ static void udpclient_receive_callback(void*y, t_iemnet_chunk*c)
   if(c) {
     iemnet__addrout(x->x_statusout, x->x_addrout, x->x_addr, x->x_port);
     x->x_floatlist = iemnet__chunk2list(c,
-                                      x->x_floatlist); /* gets destroyed in the dtor */
+                                        x->x_floatlist); /* gets destroyed in the dtor */
     outlet_list(x->x_msgout, gensym("list"),x->x_floatlist->argc,
                 x->x_floatlist->argv);
   } else {

udpreceive.c

@@ -138,9 +138,9 @@ static int udpreceive_setport(t_udpreceive*x, unsigned short portno)
   }
 
   x->x_receiver = iemnet__receiver_create(sockfd,
-                                        x,
-                                        udpreceive_read_callback,
-                                        0);
+                                          x,
+                                          udpreceive_read_callback,
+                                          0);
   return 1;
 }
 

udpsend.c

@@ -138,7 +138,7 @@ static void *udpsend_new(void)
   outlet_new(&x->x_obj, gensym("float"));
   x->x_sender = NULL;
   x->x_fd = -1;
- return (x);
+  return (x);
 }
 
 IEMNET_EXTERN void udpsend_setup(void)