From 2cdd7e63f0dea4998a63b277799ea3bd0e3097eb Mon Sep 17 00:00:00 2001
From: henri <henri@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 13 Jan 2012 12:59:18 +0000
Subject: [PATCH] Minor wrapping and whitespace fixes.

---
 nsock/src/nsock_core.c |  6 +++---
 nsock/src/nsock_pcap.c |  2 ++
 nsock/src/nsock_read.c | 18 ++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/nsock/src/nsock_core.c b/nsock/src/nsock_core.c
index 45ba6ea81..7464a210d 100644
--- a/nsock/src/nsock_core.c
+++ b/nsock/src/nsock_core.c
@@ -514,10 +514,10 @@ void handle_write_result(mspool *ms, msevent *nse, enum nse_status status) {
       res = SSL_write(iod->ssl, str, bytesleft);
     else
 #endif
-      if (nse->writeinfo.dest.ss_family == AF_UNSPEC )
+      if (nse->writeinfo.dest.ss_family == AF_UNSPEC)
         res = send(nse->iod->sd, str, bytesleft, 0);
       else
-        res = sendto(nse->iod->sd, str, bytesleft, 0, (struct sockaddr *)&nse->writeinfo.dest, (int) nse->writeinfo.destlen);
+        res = sendto(nse->iod->sd, str, bytesleft, 0, (struct sockaddr *)&nse->writeinfo.dest, (int)nse->writeinfo.destlen);
     if (res == bytesleft) {
       nse->event_done = 1;
       nse->status = NSE_STATUS_SUCCESS;
@@ -685,7 +685,7 @@ static int do_actual_read(mspool *ms, msevent *nse) {
         socket_count_read_inc(iod);
         update_events(iod, ms, X_EV(EV_READ, evclr), X_EV(evclr, EV_READ));
         nse->sslinfo.ssl_desire = err;
-      } else if (err == SSL_ERROR_WANT_WRITE ) {
+      } else if (err == SSL_ERROR_WANT_WRITE) {
         int evclr;
 
         evclr = socket_count_dec_ssl_desire(nse);
diff --git a/nsock/src/nsock_pcap.c b/nsock/src/nsock_pcap.c
index f844b983f..fdde7e7a6 100644
--- a/nsock/src/nsock_pcap.c
+++ b/nsock/src/nsock_pcap.c
@@ -449,6 +449,7 @@ void nse_readpcap(nsock_event nsee, const unsigned char **l2_data, size_t *l2_le
 int nsi_pcap_linktype(nsock_iod nsiod) {
   msiod *nsi = (msiod *)nsiod;
   mspcap *mp = (mspcap *)nsi->pcap;
+
   assert(mp);
   return (mp->datalink);
 }
@@ -456,6 +457,7 @@ int nsi_pcap_linktype(nsock_iod nsiod) {
 int nsi_is_pcap(nsock_iod nsiod) {
   msiod *nsi = (msiod *)nsiod;
   mspcap *mp = (mspcap *)nsi->pcap;
+
   return (mp != NULL);
 }
 
diff --git a/nsock/src/nsock_read.c b/nsock/src/nsock_read.c
index 3dd36ccdb..d9f9d8dd6 100644
--- a/nsock/src/nsock_read.c
+++ b/nsock/src/nsock_read.c
@@ -74,10 +74,11 @@ nsock_event_id nsock_readlines(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handle
 
   if (ms->tracelevel > 0) {
     if (nsi->peerlen > 0)
-      nsock_trace(ms, "Read request for %d lines from IOD #%li [%s:%d] EID %li", nlines, nsi->id,
-                  inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
+      nsock_trace(ms, "Read request for %d lines from IOD #%li [%s:%d] EID %li",
+                  nlines, nsi->id, inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
     else
-      nsock_trace(ms, "Read request for %d lines from IOD #%li (peer unspecified) EID %li", nlines, nsi->id, nse->id);
+      nsock_trace(ms, "Read request for %d lines from IOD #%li (peer unspecified) EID %li",
+                  nlines, nsi->id, nse->id);
   }
 
   nse->readinfo.read_type = NSOCK_READLINES;
@@ -101,10 +102,11 @@ nsock_event_id nsock_readbytes(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handle
 
   if (ms->tracelevel > 0) {
     if (nsi->peerlen > 0)
-      nsock_trace(ms, "Read request for %d bytes from IOD #%li [%s:%d] EID %li", nbytes, nsi->id,
-                  inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
+      nsock_trace(ms, "Read request for %d bytes from IOD #%li [%s:%d] EID %li",
+                  nbytes, nsi->id, inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
     else
-      nsock_trace(ms, "Read request for %d bytes from IOD #%li (peer unspecified) EID %li", nbytes, nsi->id, nse->id);
+      nsock_trace(ms, "Read request for %d bytes from IOD #%li (peer unspecified) EID %li",
+                  nbytes, nsi->id, nse->id);
   }
 
   nse->readinfo.read_type = NSOCK_READBYTES;
@@ -128,8 +130,8 @@ nsock_event_id nsock_read(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler han
 
   if (ms->tracelevel > 0) {
     if (nsi->peerlen > 0)
-      nsock_trace(ms, "Read request from IOD #%li [%s:%d] (timeout: %dms) EID %li", nsi->id,
-                  inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), timeout_msecs, nse->id);
+      nsock_trace(ms, "Read request from IOD #%li [%s:%d] (timeout: %dms) EID %li",
+                  nsi->id, inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), timeout_msecs, nse->id);
     else
       nsock_trace(ms, "Read request from IOD #%li (peer unspecified) (timeout: %dms) EID %li",
                   nsi->id, timeout_msecs, nse->id);