diff --git a/output.cc b/output.cc
index f1e0b44b7..59074442e 100644
--- a/output.cc
+++ b/output.cc
@@ -31,7 +31,7 @@
  *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
- *   not derivative works.)                                                * 
+ *   not derivative works.)                                                *
  * o Integrates/includes/aggregates Nmap into a proprietary executable     *
  *   installer, such as those produced by InstallShield.                   *
  * o Links to a library or executes a program that does any of the above   *
@@ -117,59 +117,66 @@ namespace std {};
 using namespace std;
 
 extern NmapOps o;
-static const char *logtypes[LOG_NUM_FILES]=LOG_NAMES;
+static const char *logtypes[LOG_NUM_FILES] = LOG_NAMES;
 
 /* Used in creating skript kiddie style output.  |<-R4d! */
-static void skid_output(char *s)
-{
+static void skid_output(char *s) {
   int i;
-  for (i=0; s[i]; i++)
+  for (i = 0; s[i]; i++)
     /* We need a 50/50 chance here, use a random number */
     if ((get_random_u8() & 0x01) == 0)
       /* Substitutions commented out are not known to me, but maybe look nice */
-      switch(s[i])
-	{
-	case 'A': s[i]='4'; break;
-	  /*	case 'B': s[i]='8'; break;
-	 	case 'b': s[i]='6'; break;
-	        case 'c': s[i]='k'; break;
-	        case 'C': s[i]='K'; break; */
-	case 'e':
-	case 'E': s[i]='3'; break;
-	case 'i':
-	case 'I': s[i]="!|1"[get_random_u8() % 3]; break;
-	  /*      case 'k': s[i]='c'; break;
-	        case 'K': s[i]='C'; break;*/
-	case 'o':
-	case 'O': s[i]='0'; break;
-	case 's':
-	case 'S': 
-	  if (s[i+1] && !isalnum((int) (unsigned char) s[i+1])) 
-	    s[i] = 'z';
-	  else s[i] = '$';
-	  break;
-	case 'z': s[i]='s'; break;
-	case 'Z': s[i]='S'; break;
-	}  
-    else
-      {
-	if (s[i] >= 'A' && s[i] <= 'Z' &&
-	    (get_random_u8() % 3 == 0)) {
-	  s[i] += 'a'-'A'; /* 1/3 chance of lower-case */
-	}
-	else if (s[i] >= 'a' && s[i] <= 'z' && (get_random_u8() % 3 == 0)) {
-	  s[i] -= 'a'-'A'; /* 1/3 chance of upper-case */
-	}
+      switch (s[i]) {
+      case 'A':
+        s[i] = '4';
+        break;
+        /*    case 'B': s[i]='8'; break;
+           case 'b': s[i]='6'; break;
+           case 'c': s[i]='k'; break;
+           case 'C': s[i]='K'; break; */
+      case 'e':
+      case 'E':
+        s[i] = '3';
+        break;
+      case 'i':
+      case 'I':
+        s[i] = "!|1"[get_random_u8() % 3];
+        break;
+        /*      case 'k': s[i]='c'; break;
+           case 'K': s[i]='C'; break; */
+      case 'o':
+      case 'O':
+        s[i] = '0';
+        break;
+      case 's':
+      case 'S':
+        if (s[i + 1] && !isalnum((int) (unsigned char) s[i + 1]))
+          s[i] = 'z';
+        else
+          s[i] = '$';
+        break;
+      case 'z':
+        s[i] = 's';
+        break;
+      case 'Z':
+        s[i] = 'S';
+        break;
+    } else {
+      if (s[i] >= 'A' && s[i] <= 'Z' && (get_random_u8() % 3 == 0)) {
+        s[i] += 'a' - 'A';      /* 1/3 chance of lower-case */
+      } else if (s[i] >= 'a' && s[i] <= 'z' && (get_random_u8() % 3 == 0)) {
+        s[i] -= 'a' - 'A';      /* 1/3 chance of upper-case */
       }
+    }
 }
 
 /* Remove all "\nSF:" from fingerprints */
-static char* xml_sf_convert (const char* str) {
+static char *xml_sf_convert(const char *str) {
   char *temp = (char *) safe_malloc(strlen(str) + 1);
-  char *dst = temp, *src = (char *)str;
+  char *dst = temp, *src = (char *) str;
   char *ampptr = 0;
 
-  while(*src) {
+  while (*src) {
     if (strncmp(src, "\nSF:", 4) == 0) {
       src += 4;
       continue;
@@ -177,28 +184,25 @@ static char* xml_sf_convert (const char* str) {
     /* Needed so "&something;" is not truncated midway */
     if (*src == '&') {
       ampptr = dst;
-    }
-    else if (*src == ';') {
+    } else if (*src == ';') {
       ampptr = 0;
     }
     *dst++ = *src++;
   }
   if (ampptr != 0) {
     *ampptr = '\0';
-  }
-  else {
+  } else {
     *dst = '\0';
   }
   return temp;
 }
 
-
 // Creates an XML <service> element for the information given in
 // serviceDeduction.  This function should only be called if ether
 // the service name or the service fingerprint is non-null.
 // Returns a pointer to a buffer containing the element,
 // you will have to call free on it.
-static char * getServiceXMLBuf(struct serviceDeductions *sd) {
+static char *getServiceXMLBuf(struct serviceDeductions *sd) {
   string versionxmlstring = "";
   char rpcbuf[128];
   char confBuf[20];
@@ -206,15 +210,15 @@ static char * getServiceXMLBuf(struct serviceDeductions *sd) {
   char *xml_hostname = NULL, *xml_ostype = NULL, *xml_devicetype = NULL;
   char *xml_servicefp = NULL, *xml_servicefp_temp = NULL;
 
-
-  versionxmlstring =  "<service name=\"";
-  versionxmlstring += sd->name? sd->name : "unknown";
+  versionxmlstring = "<service name=\"";
+  versionxmlstring += sd->name ? sd->name : "unknown";
   versionxmlstring += "\"";
   if (sd->product) {
     xml_product = xml_convert(sd->product);
     versionxmlstring += " product=\"";
     versionxmlstring += xml_product;
-    free(xml_product); xml_product = NULL;
+    free(xml_product);
+    xml_product = NULL;
     versionxmlstring += '\"';
   }
 
@@ -222,7 +226,8 @@ static char * getServiceXMLBuf(struct serviceDeductions *sd) {
     xml_version = xml_convert(sd->version);
     versionxmlstring += " version=\"";
     versionxmlstring += xml_version;
-    free(xml_version); xml_version = NULL;
+    free(xml_version);
+    xml_version = NULL;
     versionxmlstring += '\"';
   }
 
@@ -230,7 +235,8 @@ static char * getServiceXMLBuf(struct serviceDeductions *sd) {
     xml_extrainfo = xml_convert(sd->extrainfo);
     versionxmlstring += " extrainfo=\"";
     versionxmlstring += xml_extrainfo;
-    free(xml_extrainfo); xml_extrainfo = NULL;
+    free(xml_extrainfo);
+    xml_extrainfo = NULL;
     versionxmlstring += '\"';
   }
 
@@ -238,7 +244,8 @@ static char * getServiceXMLBuf(struct serviceDeductions *sd) {
     xml_hostname = xml_convert(sd->hostname);
     versionxmlstring += " hostname=\"";
     versionxmlstring += xml_hostname;
-    free(xml_hostname); xml_hostname = NULL;
+    free(xml_hostname);
+    xml_hostname = NULL;
     versionxmlstring += '\"';
   }
 
@@ -246,7 +253,8 @@ static char * getServiceXMLBuf(struct serviceDeductions *sd) {
     xml_ostype = xml_convert(sd->ostype);
     versionxmlstring += " ostype=\"";
     versionxmlstring += xml_ostype;
-    free(xml_ostype); xml_ostype = NULL;
+    free(xml_ostype);
+    xml_ostype = NULL;
     versionxmlstring += '\"';
   }
 
@@ -254,7 +262,8 @@ static char * getServiceXMLBuf(struct serviceDeductions *sd) {
     xml_devicetype = xml_convert(sd->devicetype);
     versionxmlstring += " devicetype=\"";
     versionxmlstring += xml_devicetype;
-    free(xml_devicetype); xml_devicetype = NULL;
+    free(xml_devicetype);
+    xml_devicetype = NULL;
     versionxmlstring += '\"';
   }
 
@@ -263,23 +272,26 @@ static char * getServiceXMLBuf(struct serviceDeductions *sd) {
     xml_servicefp = xml_sf_convert(xml_servicefp_temp);
     versionxmlstring += " servicefp=\"";
     versionxmlstring += xml_servicefp;
-    free(xml_servicefp_temp); xml_servicefp_temp = NULL;
-    free(xml_servicefp); xml_servicefp = NULL;
+    free(xml_servicefp_temp);
+    xml_servicefp_temp = NULL;
+    free(xml_servicefp);
+    xml_servicefp = NULL;
     versionxmlstring += '\"';
   }
 
   if (o.rpcscan && sd->rpc_status == RPC_STATUS_GOOD_PROG) {
-    Snprintf(rpcbuf, sizeof(rpcbuf), 
-	     " rpcnum=\"%li\" lowver=\"%i\" highver=\"%i\" proto=\"rpc\"", 
-	     sd->rpc_program, sd->rpc_lowver, sd->rpc_highver);
-  } else rpcbuf[0] = '\0';
+    Snprintf(rpcbuf, sizeof(rpcbuf),
+             " rpcnum=\"%li\" lowver=\"%i\" highver=\"%i\" proto=\"rpc\"",
+             sd->rpc_program, sd->rpc_lowver, sd->rpc_highver);
+  } else
+    rpcbuf[0] = '\0';
 
   versionxmlstring += " ";
-  versionxmlstring += (sd->service_tunnel == SERVICE_TUNNEL_SSL)? "tunnel=\"ssl\" " : "";
+  versionxmlstring += (sd->service_tunnel == SERVICE_TUNNEL_SSL) ? "tunnel=\"ssl\" " : "";
   versionxmlstring += "method=\"";
-  versionxmlstring += (sd->dtype == SERVICE_DETECTION_TABLE)? "table" : "probed";
+  versionxmlstring += (sd->dtype == SERVICE_DETECTION_TABLE) ? "table" : "probed";
   versionxmlstring += "\" conf=\"";
-  Snprintf(confBuf,20,"%i",sd->name_confidence);
+  Snprintf(confBuf, 20, "%i", sd->name_confidence);
   versionxmlstring += confBuf;
   versionxmlstring += "\"";
   versionxmlstring += rpcbuf;
@@ -294,7 +306,8 @@ void win32_warn_raw_sockets(const char *devname) {
   static set<string> shown_names;
 
   if (devname != NULL && shown_names.find(devname) == shown_names.end()) {
-    error("WARNING: Using raw sockets because %s is not an ethernet device. This probably won't work on Windows.\n", devname);
+    error("WARNING: Using raw sockets because %s is not an ethernet device."
+          " This probably won't work on Windows.\n", devname);
     shown_names.insert(devname);
   }
 }
@@ -307,7 +320,8 @@ bool DnetName2PcapName(const char *dnetdev, char *pcapdev, int pcapdevlen);
    eth_open and so can help diagnose connection problems.  Additionally display
    WinPcap interface names that are not mapped to by any libdnet name, in other
    words the names of interfaces Nmap has no way of using.*/
-static void print_iflist_pcap_mapping(const struct interface_info *iflist, int numifs) {
+static void print_iflist_pcap_mapping(const struct interface_info *iflist,
+                                      int numifs) {
   pcap_if_t *pcap_ifs;
   list<const pcap_if_t *> leftover_pcap_ifs;
   list<const pcap_if_t *>::iterator leftover_p;
@@ -316,7 +330,7 @@ static void print_iflist_pcap_mapping(const struct interface_info *iflist, int n
   /* Build a list of "leftover" libpcap interfaces. Initially it contains all
      the interfaces. */
   pcap_ifs = getpcapinterfaces();
-  for (const pcap_if_t *p = pcap_ifs; p != NULL; p = p->next)
+  for (const pcap_if_t * p = pcap_ifs; p != NULL; p = p->next)
     leftover_pcap_ifs.push_front(p);
 
   if (numifs > 0 || !leftover_pcap_ifs.empty()) {
@@ -332,7 +346,8 @@ static void print_iflist_pcap_mapping(const struct interface_info *iflist, int n
       if (DnetName2PcapName(iflist[i].devname, pcap_name, sizeof(pcap_name))) {
         /* We got a name. Remove it from the list of leftovers. */
         list<const pcap_if_t *>::iterator next;
-        for (leftover_p = leftover_pcap_ifs.begin(); leftover_p != leftover_pcap_ifs.end(); leftover_p = next) {
+        for (leftover_p = leftover_pcap_ifs.begin();
+             leftover_p != leftover_pcap_ifs.end(); leftover_p = next) {
           next = leftover_p;
           next++;
           if (strcmp((*leftover_p)->name, pcap_name) == 0)
@@ -348,7 +363,9 @@ static void print_iflist_pcap_mapping(const struct interface_info *iflist, int n
 
     /* Show the "leftover" libpcap interface names (those without a libdnet
        name that maps to them). */
-    for (leftover_p = leftover_pcap_ifs.begin(); leftover_p != leftover_pcap_ifs.end(); leftover_p++) {
+    for (leftover_p = leftover_pcap_ifs.begin();
+         leftover_p != leftover_pcap_ifs.end();
+         leftover_p++) {
       Tbl.addItem(i + 1, 0, false, "<none>");
       Tbl.addItem(i + 1, 1, false, (*leftover_p)->name);
       i++;
@@ -375,28 +392,36 @@ int print_iflist(void) {
   if (numifs == 0) {
     log_write(LOG_PLAIN, "INTERFACES: NONE FOUND(!)\n");
   } else {
-    int devcol=0, shortdevcol=1, ipcol=2, typecol = 3, upcol = 4, maccol = 5;
-    Tbl = new NmapOutputTable( numifs+1, 6 );
+    int devcol = 0, shortdevcol = 1, ipcol = 2, typecol = 3, upcol = 4, maccol = 5;
+    Tbl = new NmapOutputTable(numifs + 1, 6);
     Tbl->addItem(0, devcol, false, "DEV", 3);
     Tbl->addItem(0, shortdevcol, false, "(SHORT)", 7);
     Tbl->addItem(0, ipcol, false, "IP/MASK", 7);
     Tbl->addItem(0, typecol, false, "TYPE", 4);
     Tbl->addItem(0, upcol, false, "UP", 2);
     Tbl->addItem(0, maccol, false, "MAC", 3);
-    for(i=0; i < numifs; i++) {
-      Tbl->addItem(i+1, devcol, false, iflist[i].devfullname);
-      Tbl->addItemFormatted(i+1, shortdevcol, false, "(%s)", iflist[i].devname);
-      Tbl->addItemFormatted(i+1, ipcol, false, "%s/%d", inet_ntop_ez(&(iflist[i].addr), sizeof(iflist[i].addr)), iflist[i].netmask_bits);
+    for (i = 0; i < numifs; i++) {
+      Tbl->addItem(i + 1, devcol, false, iflist[i].devfullname);
+      Tbl->addItemFormatted(i + 1, shortdevcol, false, "(%s)",
+                            iflist[i].devname);
+      Tbl->addItemFormatted(i + 1, ipcol, false, "%s/%d",
+                            inet_ntop_ez(&(iflist[i].addr), sizeof(iflist[i].addr)),
+                            iflist[i].netmask_bits);
       if (iflist[i].device_type == devt_ethernet) {
-	Tbl->addItem(i+1, typecol, false, "ethernet");
-	Tbl->addItemFormatted(i+1, maccol, false, "%02X:%02X:%02X:%02X:%02X:%02X",  iflist[i].mac[0], iflist[i].mac[1], iflist[i].mac[2], iflist[i].mac[3], iflist[i].mac[4], iflist[i].mac[5]);	
-      }
-      else if (iflist[i].device_type == devt_loopback)
-	Tbl->addItem(i+1, typecol, false, "loopback");
+        Tbl->addItem(i + 1, typecol, false, "ethernet");
+        Tbl->addItemFormatted(i + 1, maccol, false,
+                              "%02X:%02X:%02X:%02X:%02X:%02X",
+                              iflist[i].mac[0], iflist[i].mac[1],
+                              iflist[i].mac[2], iflist[i].mac[3],
+                              iflist[i].mac[4], iflist[i].mac[5]);
+      } else if (iflist[i].device_type == devt_loopback)
+        Tbl->addItem(i + 1, typecol, false, "loopback");
       else if (iflist[i].device_type == devt_p2p)
-	Tbl->addItem(i+1, typecol, false, "point2point");
-      else Tbl->addItem(i+1, typecol, false, "other");
-      Tbl->addItem(i+1, upcol, false, (iflist[i].device_up? "up" : "down"));
+        Tbl->addItem(i + 1, typecol, false, "point2point");
+      else
+        Tbl->addItem(i + 1, typecol, false, "other");
+      Tbl->addItem(i + 1, upcol, false,
+                   (iflist[i].device_up ? "up" : "down"));
     }
     log_write(LOG_PLAIN, "************************INTERFACES************************\n");
     log_write(LOG_PLAIN, "%s\n", Tbl->printableTable(NULL));
@@ -417,25 +442,26 @@ int print_iflist(void) {
   if (numroutes == 0) {
     log_write(LOG_PLAIN, "ROUTES: NONE FOUND(!)\n");
   } else {
-    int dstcol=0, devcol=1, gwcol=2;
-    Tbl = new NmapOutputTable( numroutes+1, 3 );
+    int dstcol = 0, devcol = 1, gwcol = 2;
+    Tbl = new NmapOutputTable(numroutes + 1, 3);
     Tbl->addItem(0, dstcol, false, "DST/MASK", 8);
     Tbl->addItem(0, devcol, false, "DEV", 3);
     Tbl->addItem(0, gwcol, false, "GATEWAY", 7);
-    for(i=0; i < numroutes; i++) {
+    for (i = 0; i < numroutes; i++) {
       mask_nbo = htonl(routes[i].netmask);
       addr_mtob(&mask_nbo, sizeof(mask_nbo), &nbits);
       assert(nbits <= 32);
       ia.s_addr = routes[i].dest;
-      Tbl->addItemFormatted(i+1, dstcol, false, "%s/%d", inet_ntoa(ia), nbits);
-      Tbl->addItem(i+1, devcol, false, routes[i].device->devfullname);
+      Tbl->addItemFormatted(i + 1, dstcol, false, "%s/%d", inet_ntoa(ia),
+                            nbits);
+      Tbl->addItem(i + 1, devcol, false, routes[i].device->devfullname);
       if (routes[i].gw.s_addr != 0)
-	Tbl->addItem(i+1, gwcol, true, inet_ntoa(routes[i].gw));
+        Tbl->addItem(i + 1, gwcol, true, inet_ntoa(routes[i].gw));
     }
-        log_write(LOG_PLAIN, "**************************ROUTES**************************\n");
-	log_write(LOG_PLAIN, "%s\n", Tbl->printableTable(NULL));
-	log_flush_all();
-	delete Tbl;
+    log_write(LOG_PLAIN, "**************************ROUTES**************************\n");
+    log_write(LOG_PLAIN, "%s\n", Tbl->printableTable(NULL));
+    log_flush_all();
+    delete Tbl;
   }
   return 0;
 }
@@ -444,8 +470,8 @@ int print_iflist(void) {
    Name nmap normal output will use to describe the port.  This takes
    into account to confidence level, any SSL tunneling, etc.  Truncates
    namebuf to 0 length if there is no room.*/
-static void getNmapServiceName(struct serviceDeductions *sd, int state, 
-			       char *namebuf, int buflen) {
+static void getNmapServiceName(struct serviceDeductions *sd, int state,
+                               char *namebuf, int buflen) {
   const char *tunnel_prefix;
   int len;
 
@@ -468,39 +494,39 @@ static void getNmapServiceName(struct serviceDeductions *sd, int state,
 }
 
 #ifndef NOLUA
-static char* formatScriptOutput(ScriptResult sr) {
-	std::string result = std::string(), output = sr.get_output();
-	string::size_type pos;
-	char *c_result, *c_output = new char[output.length()+1];
-    strncpy(c_output, output.c_str(), output.length()+1);
-	int line = 0;
-	std::string line_prfx = "|  ";
+static char *formatScriptOutput(ScriptResult sr) {
+  std::string result = std::string(), output = sr.get_output();
+  string::size_type pos;
+  char *c_result, *c_output = new char[output.length() + 1];
+  strncpy(c_output, output.c_str(), output.length() + 1);
+  int line = 0;
+  std::string line_prfx = "|  ";
 
-	char* token = strtok(c_output, "\n");
+  char *token = strtok(c_output, "\n");
 
-	result += line_prfx + sr.get_id() + ": ";
+  result += line_prfx + sr.get_id() + ": ";
 
-	while(token != NULL) {
-		if(line > 0)
-			result += line_prfx;
-		result += std::string(token) + "\n";
-		token = strtok(NULL, "\n");
-		line++;
-	}
+  while (token != NULL) {
+    if (line > 0)
+      result += line_prfx;
+    result += std::string(token) + "\n";
+    token = strtok(NULL, "\n");
+    line++;
+  }
 
-	// fix the last line
-	pos = result.rfind(line_prfx);
-	result.replace(pos, 3, "|_ ");
+  // fix the last line
+  pos = result.rfind(line_prfx);
+  result.replace(pos, 3, "|_ ");
 
-	// delete the unwanted trailing newline
-	pos = result.rfind("\n");
-	if(pos!=std::string::npos){
-		result.erase(pos, strlen("\n"));
-	}
-	c_result = strdup(result.c_str());
+  // delete the unwanted trailing newline
+  pos = result.rfind("\n");
+  if (pos != std::string::npos) {
+    result.erase(pos, strlen("\n"));
+  }
+  c_result = strdup(result.c_str());
 
-    delete[] c_output;
-	return c_result;
+  delete[]c_output;
+  return c_result;
 }
 #endif /* NOLUA */
 
@@ -508,18 +534,18 @@ static char* formatScriptOutput(ScriptResult sr) {
    ports found on the machine.  It also handles the Machine/Greppable
    output and the XML output.  It is pretty ugly -- in particular I
    should write helper functions to handle the table creation */
-void printportoutput(Target *currenths, PortList *plist) {
-  char protocol[MAX_IPPROTOSTRLEN+1];
+void printportoutput(Target * currenths, PortList * plist) {
+  char protocol[MAX_IPPROTOSTRLEN + 1];
   char rpcinfo[64];
   char rpcmachineinfo[64];
   char portinfo[64];
   char grepvers[256];
   char grepown[64];
   char *p;
-  char * xmlBuf=NULL;
+  char *xmlBuf = NULL;
   const char *state;
   char serviceinfo[64];
-  char *name=NULL;
+  char *name = NULL;
   int i;
   int first = 1;
   struct protoent *proto;
@@ -527,12 +553,12 @@ void printportoutput(Target *currenths, PortList *plist) {
   char hostname[1200];
   struct serviceDeductions sd;
   NmapOutputTable *Tbl = NULL;
-  int portcol = -1; // port or IP protocol #
-  int statecol = -1; // port/protocol state
-  int servicecol = -1; // service or protocol name
+  int portcol = -1;             // port or IP protocol #
+  int statecol = -1;            // port/protocol state
+  int servicecol = -1;          // service or protocol name
   int versioncol = -1;
   int reasoncol = -1;
-  //  int ownercol = -1; // Used for ident scan
+  // int ownercol = -1; // Used for ident scan
   int colno = 0;
   unsigned int rowno;
   int numrows;
@@ -548,8 +574,8 @@ void printportoutput(Target *currenths, PortList *plist) {
   int istate;
 
   while ((istate = plist->nextIgnoredState(prevstate)) != PORT_UNKNOWN) {
-    log_write(LOG_XML, "<extraports state=\"%s\" count=\"%d\">\n", 
-	    statenum2str(istate), plist->getStateCounts(istate));
+    log_write(LOG_XML, "<extraports state=\"%s\" count=\"%d\">\n",
+              statenum2str(istate), plist->getStateCounts(istate));
     print_xml_state_summary(plist, istate);
     log_write(LOG_XML, "</extraports>\n");
     prevstate = istate;
@@ -557,31 +583,33 @@ void printportoutput(Target *currenths, PortList *plist) {
 
   if (numignoredports == plist->numports) {
     if (numignoredports == 0) {
-      log_write(LOG_PLAIN, "0 ports scanned on %s\n", currenths->NameIP(hostname, sizeof(hostname)));
+      log_write(LOG_PLAIN, "0 ports scanned on %s\n",
+                currenths->NameIP(hostname, sizeof(hostname)));
     } else {
-      log_write(LOG_PLAIN,
-		"%s %d scanned %s on %s %s ",
-		(numignoredports == 1)? "The" : "All", numignoredports,
-		(numignoredports == 1)? "port" : "ports", 
-		currenths->NameIP(hostname, sizeof(hostname)), 
-		(numignoredports == 1)? "is" : "are");
+      log_write(LOG_PLAIN, "%s %d scanned %s on %s %s ",
+                (numignoredports == 1) ? "The" : "All", numignoredports,
+                (numignoredports == 1) ? "port" : "ports",
+                currenths->NameIP(hostname, sizeof(hostname)),
+                (numignoredports == 1) ? "is" : "are");
       if (plist->numIgnoredStates() == 1) {
-	log_write(LOG_PLAIN, "%s", statenum2str(plist->nextIgnoredState(PORT_UNKNOWN)));
+        log_write(LOG_PLAIN, "%s", statenum2str(plist->nextIgnoredState(PORT_UNKNOWN)));
       } else {
-	prevstate = PORT_UNKNOWN;
-	while ((istate = plist->nextIgnoredState(prevstate)) != PORT_UNKNOWN) {
-	  if (prevstate != PORT_UNKNOWN) log_write(LOG_PLAIN, " or ");
-	  log_write(LOG_PLAIN, "%s (%d)", statenum2str(istate), plist->getStateCounts(istate));
-	  prevstate = istate;
-	}
+        prevstate = PORT_UNKNOWN;
+        while ((istate = plist->nextIgnoredState(prevstate)) != PORT_UNKNOWN) {
+          if (prevstate != PORT_UNKNOWN)
+            log_write(LOG_PLAIN, " or ");
+          log_write(LOG_PLAIN, "%s (%d)", statenum2str(istate),
+                    plist->getStateCounts(istate));
+          prevstate = istate;
+        }
       }
-      if(o.reason) 
-		  print_state_summary(plist, STATE_REASON_EMPTY);
+      if (o.reason)
+        print_state_summary(plist, STATE_REASON_EMPTY);
       log_write(LOG_PLAIN, "\n");
     }
 
-    log_write(LOG_MACHINE,"Host: %s (%s)\tStatus: Up", 
-	      currenths->targetipstr(), currenths->HostName());
+    log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Up",
+              currenths->targetipstr(), currenths->HostName());
     log_write(LOG_XML, "</ports>\n");
     return;
   }
@@ -590,52 +618,58 @@ void printportoutput(Target *currenths, PortList *plist) {
     time_t tm_secs, tm_sece;
     struct tm *tm;
     char tbufs[128];
-    tm_secs = currenths->StartTime();    
-    tm_sece = currenths->EndTime();    
+    tm_secs = currenths->StartTime();
+    tm_sece = currenths->EndTime();
     tm = localtime(&tm_secs);
-	if (strftime(tbufs, sizeof(tbufs), "%Y-%m-%d %H:%M:%S %Z", tm) <= 0)
+    if (strftime(tbufs, sizeof(tbufs), "%Y-%m-%d %H:%M:%S %Z", tm) <= 0)
       fatal("Unable to properly format host start time");
 
-    log_write(LOG_PLAIN,"Scanned at %s for %lds\n",
-	      tbufs, tm_sece - tm_secs);
+    log_write(LOG_PLAIN, "Scanned at %s for %lds\n",
+              tbufs, tm_sece - tm_secs);
   }
-  log_write(LOG_PLAIN,"Interesting %s on %s:\n",
-	    (o.ipprotscan)? "protocols" : "ports", 
-	    currenths->NameIP(hostname, sizeof(hostname)));
-  log_write(LOG_MACHINE,"Host: %s (%s)", currenths->targetipstr(), 
-	    currenths->HostName());
-  
+  log_write(LOG_PLAIN, "Interesting %s on %s:\n",
+            (o.ipprotscan) ? "protocols" : "ports",
+            currenths->NameIP(hostname, sizeof(hostname)));
+  log_write(LOG_MACHINE, "Host: %s (%s)", currenths->targetipstr(),
+            currenths->HostName());
+
   /* Show line like:
      Not shown: 3995 closed ports, 514 filtered ports
      if appropriate (note that states are reverse-sorted by # of ports) */
   prevstate = PORT_UNKNOWN;
   while ((istate = plist->nextIgnoredState(prevstate)) != PORT_UNKNOWN) {
-    if (prevstate == PORT_UNKNOWN) 
+    if (prevstate == PORT_UNKNOWN)
       log_write(LOG_PLAIN, "Not shown: ");
-    else log_write(LOG_PLAIN, ", ");
+    else
+      log_write(LOG_PLAIN, ", ");
     char desc[32];
     if (o.ipprotscan)
-      Snprintf(desc, sizeof(desc), (plist->getStateCounts(istate) == 1)? "protocol" : "protocols");
-    else 
-      Snprintf(desc, sizeof(desc), (plist->getStateCounts(istate) == 1)? "port" : "ports");
-    log_write(LOG_PLAIN, "%d %s %s", plist->getStateCounts(istate), statenum2str(istate), desc);
+      Snprintf(desc, sizeof(desc),
+               (plist->getStateCounts(istate) ==
+                1) ? "protocol" : "protocols");
+    else
+      Snprintf(desc, sizeof(desc),
+               (plist->getStateCounts(istate) == 1) ? "port" : "ports");
+    log_write(LOG_PLAIN, "%d %s %s", plist->getStateCounts(istate),
+              statenum2str(istate), desc);
     prevstate = istate;
   }
 
-  if (prevstate != PORT_UNKNOWN) log_write(LOG_PLAIN, "\n");
+  if (prevstate != PORT_UNKNOWN)
+    log_write(LOG_PLAIN, "\n");
 
-  if(o.reason) 
-		print_state_summary(plist, STATE_REASON_FULL);
+  if (o.reason)
+    print_state_summary(plist, STATE_REASON_FULL);
 
   /* OK, now it is time to deal with the service table ... */
   colno = 0;
   portcol = colno++;
   statecol = colno++;
   servicecol = colno++;
-  if(o.reason)
-	reasoncol = colno++;
+  if (o.reason)
+    reasoncol = colno++;
   /*  if (o.identscan)
-      ownercol = colno++; */
+     ownercol = colno++; */
   if (o.servicescan || o.rpcscan)
     versioncol = colno++;
 
@@ -643,10 +677,10 @@ void printportoutput(Target *currenths, PortList *plist) {
 
 #ifndef NOLUA
   int scriptrows = 0;
-  if(plist->numscriptresults > 0)
+  if (plist->numscriptresults > 0)
     scriptrows = plist->numscriptresults;
   numrows += scriptrows;
-#endif 
+#endif
 
   assert(numrows > 0);
   numrows++; // The header counts as a row
@@ -656,196 +690,218 @@ void printportoutput(Target *currenths, PortList *plist) {
   // Lets start with the headers
   if (o.ipprotscan)
     Tbl->addItem(0, portcol, false, "PROTOCOL", 8);
-  else Tbl->addItem(0, portcol, false, "PORT", 4);
+  else
+    Tbl->addItem(0, portcol, false, "PORT", 4);
   Tbl->addItem(0, statecol, false, "STATE", 5);
   Tbl->addItem(0, servicecol, false, "SERVICE", 7);
   if (versioncol > 0)
     Tbl->addItem(0, versioncol, false, "VERSION", 7);
-  if(reasoncol > 0)
-	Tbl->addItem(0, reasoncol, false, "REASON", 6);
-  /*  if (ownercol > 0)
-      Tbl->addItem(0, ownercol, false, "OWNER", 5); */
+  if (reasoncol > 0)
+    Tbl->addItem(0, reasoncol, false, "REASON", 6);
+  /*
+  if (ownercol > 0)
+    Tbl->addItem(0, ownercol, false, "OWNER", 5);
+  */
+
+  log_write(LOG_MACHINE, "\t%s: ", (o.ipprotscan) ? "Protocols" : "Ports");
 
-  log_write(LOG_MACHINE,"\t%s: ", (o.ipprotscan)? "Protocols" : "Ports" );
-  
   rowno = 1;
   if (o.ipprotscan) {
     current = NULL;
-    while( (current=plist->nextPort(current, IPPROTO_IP, 0))!=NULL ) {
+    while ((current = plist->nextPort(current, IPPROTO_IP, 0)) != NULL) {
       if (!plist->isIgnoredState(current->state)) {
-	if (!first) log_write(LOG_MACHINE,", ");
-	else first = 0;
-	if(o.reason) 
-		Tbl->addItem(rowno, reasoncol, true, port_reason_str(current->reason));
-	state = statenum2str(current->state);
-	proto = nmap_getprotbynum(htons(current->portno));
-	Snprintf(portinfo, sizeof(portinfo), "%s",
-		 proto?proto->p_name: "unknown");
-	Tbl->addItemFormatted(rowno, portcol, false, "%d", current->portno);
-	Tbl->addItem(rowno, statecol, true, state);
-	Tbl->addItem(rowno, servicecol, true, portinfo);
-	log_write(LOG_MACHINE,"%d/%s/%s/", current->portno, state, 
-		  (proto)? proto->p_name : "");
-	log_write(LOG_XML, "<port protocol=\"ip\" portid=\"%d\"><state state=\"%s\" reason=\"%s\" reason_ttl=\"%d\"",
-       current->portno, state, reason_str(current->reason.reason_id, SINGULAR), current->reason.ttl);
+        if (!first)
+          log_write(LOG_MACHINE, ", ");
+        else
+          first = 0;
+        if (o.reason)
+          Tbl->addItem(rowno, reasoncol, true, port_reason_str(current->reason));
+        state = statenum2str(current->state);
+        proto = nmap_getprotbynum(htons(current->portno));
+        Snprintf(portinfo, sizeof(portinfo), "%s", proto ? proto->p_name : "unknown");
+        Tbl->addItemFormatted(rowno, portcol, false, "%d", current->portno);
+        Tbl->addItem(rowno, statecol, true, state);
+        Tbl->addItem(rowno, servicecol, true, portinfo);
+        log_write(LOG_MACHINE, "%d/%s/%s/", current->portno, state,
+                  (proto) ? proto->p_name : "");
+        log_write(LOG_XML, "<port protocol=\"ip\" portid=\"%d\">"
+                  "<state state=\"%s\" reason=\"%s\" reason_ttl=\"%d\"",
+                  current->portno, state,
+                  reason_str(current->reason.reason_id, SINGULAR),
+                  current->reason.ttl);
 
-	if(current->reason.ip_addr.s_addr)
-		log_write(LOG_XML, " reason_ip=\"%s\"", inet_ntoa(current->reason.ip_addr));
-	log_write(LOG_XML, "/>");
+        if (current->reason.ip_addr.s_addr)
+          log_write(LOG_XML, " reason_ip=\"%s\"", inet_ntoa(current->reason.ip_addr));
+        log_write(LOG_XML, "/>");
 
-	if (proto && proto->p_name && *proto->p_name)
-	  log_write(LOG_XML, "\n<service name=\"%s\" conf=\"8\" method=\"table\" />", proto->p_name);
-	log_write(LOG_XML, "</port>\n");
-	rowno++;
+        if (proto && proto->p_name && *proto->p_name)
+          log_write(LOG_XML, "\n<service name=\"%s\" conf=\"8\" method=\"table\" />", proto->p_name);
+        log_write(LOG_XML, "</port>\n");
+        rowno++;
       }
     }
   } else {
     current = NULL;
-    while( (current=plist->nextPort(current, TCPANDUDPANDSCTP, 0))!=NULL ) {
+    while ((current = plist->nextPort(current, TCPANDUDPANDSCTP, 0)) != NULL) {
       if (!plist->isIgnoredState(current->state)) {
-	if (!first) log_write(LOG_MACHINE,", ");
-	else first = 0;
-	strcpy(protocol, IPPROTO2STR(current->proto));
-	Snprintf(portinfo, sizeof(portinfo), "%d/%s", current->portno, protocol);
-	state = statenum2str(current->state);
-	current->getServiceDeductions(&sd);
-	if (sd.service_fp && saved_servicefps.size() <= 8)
-	  saved_servicefps.push_back(sd.service_fp);
+        if (!first)
+          log_write(LOG_MACHINE, ", ");
+        else
+          first = 0;
+        strcpy(protocol, IPPROTO2STR(current->proto));
+        Snprintf(portinfo, sizeof(portinfo), "%d/%s", current->portno, protocol);
+        state = statenum2str(current->state);
+        current->getServiceDeductions(&sd);
+        if (sd.service_fp && saved_servicefps.size() <= 8)
+          saved_servicefps.push_back(sd.service_fp);
 
-	if (o.rpcscan) {
-	  switch(sd.rpc_status) {
-	  case RPC_STATUS_UNTESTED:
-	    rpcinfo[0] = '\0';
-	    strcpy(rpcmachineinfo, "");
-	    break;
-	  case RPC_STATUS_UNKNOWN:
-	    strcpy(rpcinfo, "(RPC (Unknown Prog #))");
-	    strcpy(rpcmachineinfo, "R");
-	    break;
-	  case RPC_STATUS_NOT_RPC:
-	    rpcinfo[0] = '\0';
-	    strcpy(rpcmachineinfo, "N");
-	    break;
-	  case RPC_STATUS_GOOD_PROG:
-	    name = nmap_getrpcnamebynum(sd.rpc_program);
-	    Snprintf(rpcmachineinfo, sizeof(rpcmachineinfo), "(%s:%li*%i-%i)", (name)? name : "", sd.rpc_program, sd.rpc_lowver, sd.rpc_highver);
-	    if (!name) {
-	      Snprintf(rpcinfo, sizeof(rpcinfo), "(#%li (unknown) V%i-%i)", sd.rpc_program, sd.rpc_lowver, sd.rpc_highver);
-	    } else {
-	      if (sd.rpc_lowver == sd.rpc_highver) {
-		Snprintf(rpcinfo, sizeof(rpcinfo), "(%s V%i)", name, sd.rpc_lowver);
-	      } else 
-		Snprintf(rpcinfo, sizeof(rpcinfo), "(%s V%i-%i)", name, sd.rpc_lowver, sd.rpc_highver);
-	    }
-	    break;
-	  default:
-	    fatal("Unknown rpc_status %d", sd.rpc_status);
-	    break;
-	  }
-	  Snprintf(serviceinfo, sizeof(serviceinfo), "%s%s%s", (sd.name)? sd.name : ((*rpcinfo)? "" : "unknown"), (sd.name)? " " : "",  rpcinfo);
-	} else {
-	  getNmapServiceName(&sd, current->state, serviceinfo, sizeof(serviceinfo));
-	  rpcmachineinfo[0] = '\0';
-	}
-	Tbl->addItem(rowno, portcol, true, portinfo);
-	Tbl->addItem(rowno, statecol, false, state);
-	Tbl->addItem(rowno, servicecol, true, serviceinfo);
-	if(o.reason) 
-		Tbl->addItem(rowno, reasoncol, true, port_reason_str(current->reason));
+        if (o.rpcscan) {
+          switch (sd.rpc_status) {
+          case RPC_STATUS_UNTESTED:
+            rpcinfo[0] = '\0';
+            strcpy(rpcmachineinfo, "");
+            break;
+          case RPC_STATUS_UNKNOWN:
+            strcpy(rpcinfo, "(RPC (Unknown Prog #))");
+            strcpy(rpcmachineinfo, "R");
+            break;
+          case RPC_STATUS_NOT_RPC:
+            rpcinfo[0] = '\0';
+            strcpy(rpcmachineinfo, "N");
+            break;
+          case RPC_STATUS_GOOD_PROG:
+            name = nmap_getrpcnamebynum(sd.rpc_program);
+            Snprintf(rpcmachineinfo, sizeof(rpcmachineinfo),
+                     "(%s:%li*%i-%i)", (name) ? name : "", sd.rpc_program,
+                     sd.rpc_lowver, sd.rpc_highver);
+            if (!name) {
+              Snprintf(rpcinfo, sizeof(rpcinfo), "(#%li (unknown) V%i-%i)",
+                       sd.rpc_program, sd.rpc_lowver, sd.rpc_highver);
+            } else {
+              if (sd.rpc_lowver == sd.rpc_highver) {
+                Snprintf(rpcinfo, sizeof(rpcinfo), "(%s V%i)", name,
+                         sd.rpc_lowver);
+              } else
+                Snprintf(rpcinfo, sizeof(rpcinfo), "(%s V%i-%i)", name,
+                         sd.rpc_lowver, sd.rpc_highver);
+            }
+            break;
+          default:
+            fatal("Unknown rpc_status %d", sd.rpc_status);
+            break;
+          }
+          Snprintf(serviceinfo, sizeof(serviceinfo), "%s%s%s",
+                   (sd.name) ? sd.name : ((*rpcinfo) ? "" : "unknown"),
+                   (sd.name) ? " " : "", rpcinfo);
+        } else {
+          getNmapServiceName(&sd, current->state, serviceinfo, sizeof(serviceinfo));
+          rpcmachineinfo[0] = '\0';
+        }
+        Tbl->addItem(rowno, portcol, true, portinfo);
+        Tbl->addItem(rowno, statecol, false, state);
+        Tbl->addItem(rowno, servicecol, true, serviceinfo);
+        if (o.reason)
+          Tbl->addItem(rowno, reasoncol, true, port_reason_str(current->reason));
 
-	/*	if (current->owner)
-		Tbl->addItem(rowno, ownercol, true, current->owner); */
-	if (*sd.fullversion)
-	  Tbl->addItem(rowno, versioncol, true, sd.fullversion);
+        /*
+        if (current->owner)
+          Tbl->addItem(rowno, ownercol, true, current->owner);
+        */
+        if (*sd.fullversion)
+          Tbl->addItem(rowno, versioncol, true, sd.fullversion);
 
-	// How should we escape illegal chars in grepable output?
-	// Well, a reasonably clean way would be backslash escapes
-	// such as \/ and \\ .  // But that makes it harder to pick
-	// out fields with awk, cut, and such.  So I'm gonna use the
-	// ugly hat (fitting to grepable output) or replacing the '/'
-	// character with '|' in the version and owner fields.
-	Strncpy(grepvers, sd.fullversion, 
-		sizeof(grepvers) / sizeof(*grepvers));
-	p = grepvers;
-	while((p = strchr(p, '/'))) {
-	  *p = '|';
-	  p++;
-	}
-	if (!current->owner) *grepown = '\0';
-	else {
-	  Strncpy(grepown, current->owner, 
-		  sizeof(grepown) / sizeof(*grepown));
-	  p = grepown;
-	  while((p = strchr(p, '/'))) {
-	    *p = '|';
-	    p++;
-	  }
-	}
-	if (!sd.name) serviceinfo[0] = '\0';
-	else {
-	  p = serviceinfo;
-	  while((p = strchr(p, '/'))) {
-	    *p = '|';
-	    p++;
-	  }
-	}
-	log_write(LOG_MACHINE,"%d/%s/%s/%s/%s/%s/%s/", current->portno, state, 
-		  protocol, grepown, serviceinfo, rpcmachineinfo, grepvers);    
-	
-	log_write(LOG_XML, "<port protocol=\"%s\" portid=\"%d\">", protocol, current->portno);
-	log_write(LOG_XML, "<state state=\"%s\" reason=\"%s\" reason_ttl=\"%d\"", state, 
-                       reason_str(current->reason.reason_id, SINGULAR), current->reason.ttl);
-	if(current->reason.ip_addr.s_addr)
-		log_write(LOG_XML, " reason_ip=\"%s\"", inet_ntoa(current->reason.ip_addr));
-	log_write(LOG_XML, "/>");
-	if (current->owner && *current->owner) {
-	  log_write(LOG_XML, "<owner name=\"%s\" />", current->owner);
-	}
-	
-	if (sd.name || sd.service_fp){
-		xmlBuf = getServiceXMLBuf(&sd);
-		if(xmlBuf){
-			log_write(LOG_XML, "%s", xmlBuf);
-			free(xmlBuf);
-			xmlBuf=NULL;
-		}
-	}
+        // How should we escape illegal chars in grepable output?
+        // Well, a reasonably clean way would be backslash escapes
+        // such as \/ and \\ .  // But that makes it harder to pick
+        // out fields with awk, cut, and such.  So I'm gonna use the
+        // ugly hat (fitting to grepable output) or replacing the '/'
+        // character with '|' in the version and owner fields.
+        Strncpy(grepvers, sd.fullversion, sizeof(grepvers) / sizeof(*grepvers));
+        p = grepvers;
+        while ((p = strchr(p, '/'))) {
+          *p = '|';
+          p++;
+        }
+        if (!current->owner)
+          *grepown = '\0';
+        else {
+          Strncpy(grepown, current->owner, sizeof(grepown) / sizeof(*grepown));
+          p = grepown;
+          while ((p = strchr(p, '/'))) {
+            *p = '|';
+            p++;
+          }
+        }
+        if (!sd.name)
+          serviceinfo[0] = '\0';
+        else {
+          p = serviceinfo;
+          while ((p = strchr(p, '/'))) {
+            *p = '|';
+            p++;
+          }
+        }
+        log_write(LOG_MACHINE, "%d/%s/%s/%s/%s/%s/%s/", current->portno,
+                  state, protocol, grepown, serviceinfo, rpcmachineinfo,
+                  grepvers);
 
-	rowno++;
-#ifndef NOLUA	
-	if(o.script) {
-		ScriptResults::iterator ssr_iter;
+        log_write(LOG_XML, "<port protocol=\"%s\" portid=\"%d\">",
+                  protocol, current->portno);
+        log_write(LOG_XML, "<state state=\"%s\" reason=\"%s\" reason_ttl=\"%d\"",
+                  state, reason_str(current->reason.reason_id, SINGULAR),
+                  current->reason.ttl);
+        if (current->reason.ip_addr.s_addr)
+          log_write(LOG_XML, " reason_ip=\"%s\"", inet_ntoa(current->reason.ip_addr));
+        log_write(LOG_XML, "/>");
+        if (current->owner && *current->owner) {
+          log_write(LOG_XML, "<owner name=\"%s\" />", current->owner);
+        }
 
-		for(	ssr_iter = current->scriptResults.begin(); 
-			ssr_iter != current->scriptResults.end(); 
-			ssr_iter++) {
-			char* xml_id= xml_convert(ssr_iter->get_id().c_str());
-			char* xml_scriptoutput= xml_convert(ssr_iter->get_output().c_str());
-			log_write(LOG_XML, "<script id=\"%s\" output=\"%s\" />", 
-					xml_id, xml_scriptoutput);
-			free(xml_id);
-			free(xml_scriptoutput);
+        if (sd.name || sd.service_fp) {
+          xmlBuf = getServiceXMLBuf(&sd);
+          if (xmlBuf) {
+            log_write(LOG_XML, "%s", xmlBuf);
+            free(xmlBuf);
+            xmlBuf = NULL;
+          }
+        }
 
-			char* script_output = formatScriptOutput((*ssr_iter));
-			Tbl->addItem(rowno, 0, true, true, script_output);
-			free(script_output);
-			rowno++;
-		}
-		
-	}
+        rowno++;
+#ifndef NOLUA
+        if (o.script) {
+          ScriptResults::iterator ssr_iter;
+
+          for (ssr_iter = current->scriptResults.begin();
+               ssr_iter != current->scriptResults.end(); ssr_iter++) {
+            char *xml_id = xml_convert(ssr_iter->get_id().c_str());
+            char *xml_scriptoutput =
+                xml_convert(ssr_iter->get_output().c_str());
+            log_write(LOG_XML, "<script id=\"%s\" output=\"%s\" />",
+                      xml_id, xml_scriptoutput);
+            free(xml_id);
+            free(xml_scriptoutput);
+
+            char *script_output = formatScriptOutput((*ssr_iter));
+            Tbl->addItem(rowno, 0, true, true, script_output);
+            free(script_output);
+            rowno++;
+          }
+
+        }
 #endif
 
-	log_write(LOG_XML, "</port>\n");
+        log_write(LOG_XML, "</port>\n");
       }
     }
-    
+
   }
   /*  log_write(LOG_PLAIN,"\n"); */
   /* Grepable output supports only one ignored state. */
   if (plist->numIgnoredStates() == 1) {
     istate = plist->nextIgnoredState(PORT_UNKNOWN);
     if (plist->getStateCounts(istate) > 0)
-      log_write(LOG_MACHINE, "\tIgnored State: %s (%d)", statenum2str(istate), plist->getStateCounts(istate));
+      log_write(LOG_MACHINE, "\tIgnored State: %s (%d)",
+                statenum2str(istate), plist->getStateCounts(istate));
   }
   log_write(LOG_XML, "</ports>\n");
 
@@ -856,10 +912,14 @@ void printportoutput(Target *currenths, PortList *plist) {
   // There may be service fingerprints I would like the user to submit
   if (saved_servicefps.size() > 0) {
     int numfps = saved_servicefps.size();
-log_write(LOG_PLAIN, "%d service%s unrecognized despite returning data. If you know the service/version, please submit the following fingerprint%s at http://www.insecure.org/cgi-bin/servicefp-submit.cgi :\n", numfps, (numfps > 1)? "s" : "", (numfps > 1)? "s" : "");
-    for(i=0; i < numfps; i++) {
+    log_write(LOG_PLAIN, "%d service%s unrecognized despite returning data."
+              " If you know the service/version, please submit the following"
+              " fingerprint%s at"
+              " http://www.insecure.org/cgi-bin/servicefp-submit.cgi :\n",
+              numfps, (numfps > 1) ? "s" : "", (numfps > 1) ? "s" : "");
+    for (i = 0; i < numfps; i++) {
       if (numfps > 1)
-	log_write(LOG_PLAIN, "==============NEXT SERVICE FINGERPRINT (SUBMIT INDIVIDUALLY)==============\n");
+        log_write(LOG_PLAIN, "==============NEXT SERVICE FINGERPRINT (SUBMIT INDIVIDUALLY)==============\n");
       log_write(LOG_PLAIN, "%s\n", saved_servicefps[i]);
     }
   }
@@ -926,69 +986,68 @@ char *xml_convert(const char *str) {
   return result;
 }
 
-char *logfilename(const char *str, struct tm *tm)
-{
-	char *ret, *end, *p;
-	char tbuf[10];
-	int retlen = strlen(str) * 6 + 1;
+char *logfilename(const char *str, struct tm *tm) {
+  char *ret, *end, *p;
+  char tbuf[10];
+  int retlen = strlen(str) * 6 + 1;
 
-	ret = (char *) safe_malloc(retlen);
-	end = ret + retlen;
+  ret = (char *) safe_malloc(retlen);
+  end = ret + retlen;
 
-	for (p = ret; *str; str++) {
-		if (*str == '%') {
-			str++;
+  for (p = ret; *str; str++) {
+    if (*str == '%') {
+      str++;
 
-			if (!*str)
-				break;
+      if (!*str)
+        break;
 
-			switch (*str) {
-			case 'H':
-				strftime(tbuf, sizeof tbuf, "%H", tm);
-				break;
-			case 'M':
-				strftime(tbuf, sizeof tbuf, "%M", tm);
-				break;
-			case 'S':
-				strftime(tbuf, sizeof tbuf, "%S", tm);
-				break;
-			case 'T':
-				strftime(tbuf, sizeof tbuf, "%H%M%S", tm);
-				break;
-			case 'R':
-				strftime(tbuf, sizeof tbuf, "%H%M", tm);
-				break;
-			case 'm':
-				strftime(tbuf, sizeof tbuf, "%m", tm);
-				break;
-			case 'd': 
-				strftime(tbuf, sizeof tbuf, "%d", tm);
-				break;
-			case 'y': 
-				strftime(tbuf, sizeof tbuf, "%y", tm);
-				break;
-			case 'Y': 
-				strftime(tbuf, sizeof tbuf, "%Y", tm);
-				break;
-			case 'D': 
-				strftime(tbuf, sizeof tbuf, "%m%d%y", tm);
-				break;
-			default:
-				*p++ = *str;
-				continue;
-			}
+      switch (*str) {
+      case 'H':
+        strftime(tbuf, sizeof tbuf, "%H", tm);
+        break;
+      case 'M':
+        strftime(tbuf, sizeof tbuf, "%M", tm);
+        break;
+      case 'S':
+        strftime(tbuf, sizeof tbuf, "%S", tm);
+        break;
+      case 'T':
+        strftime(tbuf, sizeof tbuf, "%H%M%S", tm);
+        break;
+      case 'R':
+        strftime(tbuf, sizeof tbuf, "%H%M", tm);
+        break;
+      case 'm':
+        strftime(tbuf, sizeof tbuf, "%m", tm);
+        break;
+      case 'd':
+        strftime(tbuf, sizeof tbuf, "%d", tm);
+        break;
+      case 'y':
+        strftime(tbuf, sizeof tbuf, "%y", tm);
+        break;
+      case 'Y':
+        strftime(tbuf, sizeof tbuf, "%Y", tm);
+        break;
+      case 'D':
+        strftime(tbuf, sizeof tbuf, "%m%d%y", tm);
+        break;
+      default:
+        *p++ = *str;
+        continue;
+      }
 
-			assert(end - p > 1);
-			Strncpy(p, tbuf, end - p - 1);
-			p += strlen(tbuf);
-		} else {
-			*p++ = *str;
-		}
-	}
+      assert(end - p > 1);
+      Strncpy(p, tbuf, end - p - 1);
+      p += strlen(tbuf);
+    } else {
+      *p++ = *str;
+    }
+  }
 
-	*p = 0;
+  *p = 0;
 
-	return (char *) safe_realloc(ret, strlen(ret) + 1);
+  return (char *) safe_realloc(ret, strlen(ret) + 1);
 }
 
 /* This is the workhorse of the logging functions.  Usually it is
@@ -1007,7 +1066,6 @@ void log_vwrite(int logt, const char *fmt, va_list ap) {
   int l;
   va_list apcopy;
 
-
   if (!writebuf)
     writebuf = (char *) safe_malloc(writebuflen);
 
@@ -1016,12 +1074,12 @@ void log_vwrite(int logt, const char *fmt, va_list ap) {
     skid_noxlate = true;
   }
 
-  switch(logt) {
-  case LOG_STDOUT: 
+  switch (logt) {
+  case LOG_STDOUT:
     vfprintf(o.nmap_stdout, fmt, ap);
     break;
 
-  case LOG_STDERR: 
+  case LOG_STDERR:
     fflush(stdout); // Otherwise some systems will print stderr out of order
     vfprintf(stderr, fmt, ap);
     break;
@@ -1031,40 +1089,43 @@ void log_vwrite(int logt, const char *fmt, va_list ap) {
   case LOG_SKID:
   case LOG_XML:
 #ifdef WIN32
-	  apcopy = ap;
+    apcopy = ap;
 #else
     va_copy(apcopy, ap); /* Needed in case we need to do a second vsnprintf */
 #endif
     l = logt;
     fileidx = 0;
-    while ((l&1)==0) { fileidx++; l>>=1; }
+    while ((l & 1) == 0) {
+      fileidx++;
+      l >>= 1;
+    }
     assert(fileidx < LOG_NUM_FILES);
     if (o.logfd[fileidx]) {
       len = Vsnprintf(writebuf, writebuflen, fmt, ap);
       if (len == 0) {
-	va_end(apcopy);
-	return;
+        va_end(apcopy);
+        return;
       } else if (len < 0 || len >= writebuflen) {
-	/* Didn't have enough space.  Expand writebuf and try again */
-	if (len >= writebuflen) {
-	  writebuflen = len + 1024;
-	} else {
-	  /* Windows seems to just give -1 rather than the amount of space we 
-	     would need.  So lets just gulp up a huge amount in the hope it
-	     will be enough */
-	  writebuflen *= 500;
-	}
-	writebuf = (char *) safe_realloc(writebuf, writebuflen);
-	len = Vsnprintf(writebuf, writebuflen, fmt, apcopy);
-	if (len <= 0 || len >= writebuflen) {
-	  fatal("%s: vsnprintf failed.  Even after increasing bufferlen to %d, Vsnprintf returned %d (logt == %d).  Please report this as a bug to nmap-dev (including this whole error message) as described at http://nmap.org/book/man-bugs.html.  Quitting.", __func__, writebuflen, len, logt);
-	}
+        /* Didn't have enough space.  Expand writebuf and try again */
+        if (len >= writebuflen) {
+          writebuflen = len + 1024;
+        } else {
+          /* Windows seems to just give -1 rather than the amount of space we
+             would need.  So lets just gulp up a huge amount in the hope it
+             will be enough */
+          writebuflen *= 500;
+        }
+        writebuf = (char *) safe_realloc(writebuf, writebuflen);
+        len = Vsnprintf(writebuf, writebuflen, fmt, apcopy);
+        if (len <= 0 || len >= writebuflen) {
+          fatal("%s: vsnprintf failed.  Even after increasing bufferlen to %d, Vsnprintf returned %d (logt == %d).  Please report this as a bug to nmap-dev (including this whole error message) as described at http://nmap.org/book/man-bugs.html.  Quitting.", __func__, writebuflen, len, logt);
+        }
       }
       if (logt == LOG_SKID && !skid_noxlate)
-	skid_output(writebuf);
-      rc = fwrite(writebuf,len,1,o.logfd[fileidx]);
+        skid_output(writebuf);
+      rc = fwrite(writebuf, len, 1, o.logfd[fileidx]);
       if (rc != 1) {
-	fatal("Failed to write %d bytes of data to (logt==%d) stream. fwrite returned %d.  Quitting.", len, logt, rc);
+        fatal("Failed to write %d bytes of data to (logt==%d) stream. fwrite returned %d.  Quitting.", len, logt, rc);
       }
       va_end(apcopy);
     }
@@ -1079,12 +1140,12 @@ void log_vwrite(int logt, const char *fmt, va_list ap) {
 
 /* Write some information (printf style args) to the given log stream(s).
  Remember to watch out for format string bugs.  */
-void log_write(int logt, const char *fmt, ...)
-{
-  va_list  ap;
+void log_write(int logt, const char *fmt, ...) {
+  va_list ap;
   assert(logt > 0);
 
-  if (!fmt || !*fmt) return;
+  if (!fmt || !*fmt)
+    return;
 
   for (int l = 1; l <= LOG_MAX; l <<= 1) {
     if (logt & l) {
@@ -1097,11 +1158,13 @@ void log_write(int logt, const char *fmt, ...)
 }
 
 /* Close the given log stream(s) */
-void log_close(int logt)
-{
+void log_close(int logt) {
   int i;
-  if (logt<0 || logt>LOG_FILE_MASK) return;
-  for (i=0;logt;logt>>=1,i++) if (o.logfd[i] && (logt&1)) fclose(o.logfd[i]);
+  if (logt < 0 || logt > LOG_FILE_MASK)
+    return;
+  for (i = 0; logt; logt >>= 1, i++)
+    if (o.logfd[i] && (logt & 1))
+      fclose(o.logfd[i]);
 }
 
 /* Flush the given log stream(s).  In other words, all buffered output
@@ -1122,13 +1185,14 @@ void log_flush(int logt) {
   if (logt & LOG_SKID_NOXLT)
     fatal("You are not allowed to %s() with LOG_SKID_NOXLT", __func__);
 
-  if (logt<0 || logt>LOG_FILE_MASK) return;
+  if (logt < 0 || logt > LOG_FILE_MASK)
+    return;
 
-  for (i=0;logt;logt>>=1,i++)
-    {
-      if (!o.logfd[i] || !(logt&1)) continue;
-      fflush(o.logfd[i]);
-    }
+  for (i = 0; logt; logt >>= 1, i++) {
+    if (!o.logfd[i] || !(logt & 1))
+      continue;
+    fflush(o.logfd[i]);
+  }
 
 }
 
@@ -1137,124 +1201,134 @@ void log_flush(int logt) {
 void log_flush_all() {
   int fileno;
 
-  for(fileno = 0; fileno < LOG_NUM_FILES; fileno++) {
-    if (o.logfd[fileno]) fflush(o.logfd[fileno]);
+  for (fileno = 0; fileno < LOG_NUM_FILES; fileno++) {
+    if (o.logfd[fileno])
+      fflush(o.logfd[fileno]);
   }
   fflush(stdout);
   fflush(stderr);
 }
 
-/* Open a log descriptor of the type given to the filename given.  If 
+/* Open a log descriptor of the type given to the filename given.  If
    append is nonzero, the file will be appended instead of clobbered if
    it already exists.  If the file does not exist, it will be created */
-int log_open(int logt, int append, char *filename)
-{
-  int i=0;
-  if (logt<=0 || logt>LOG_FILE_MASK) return -1;
-  while ((logt&1)==0) { i++; logt>>=1; }
-  if (o.logfd[i]) fatal("Only one %s output filename allowed",logtypes[i]);
-  if (*filename == '-' && *(filename + 1) == '\0')
-    {
-      o.logfd[i]=stdout;
-      o.nmap_stdout = fopen(DEVNULL, "w");
-      if (!o.nmap_stdout)
-	fatal("Could not assign %s to stdout for writing", DEVNULL);
+int log_open(int logt, int append, char *filename) {
+  int i = 0;
+  if (logt <= 0 || logt > LOG_FILE_MASK)
+    return -1;
+  while ((logt & 1) == 0) {
+    i++;
+    logt >>= 1;
+  }
+  if (o.logfd[i])
+    fatal("Only one %s output filename allowed", logtypes[i]);
+  if (*filename == '-' && *(filename + 1) == '\0') {
+    o.logfd[i] = stdout;
+    o.nmap_stdout = fopen(DEVNULL, "w");
+    if (!o.nmap_stdout)
+      fatal("Could not assign %s to stdout for writing", DEVNULL);
+  } else {
+    if (o.append_output)
+      o.logfd[i] = fopen(filename, "a");
+    else
+      o.logfd[i] = fopen(filename, "w");
+    if (!o.logfd[i])
+      fatal("Failed to open %s output file %s for writing", logtypes[i],
+            filename);
   }
-  else
-    {
-      if (o.append_output)
-	o.logfd[i] = fopen(filename, "a");
-      else
-	o.logfd[i] = fopen(filename, "w");
-      if (!o.logfd[i])
-	fatal("Failed to open %s output file %s for writing", logtypes[i], filename);
-    }
   return 1;
 }
 
 
 /* The items in ports should be
-   in sequential order for space savings and easier to read output.  Outputs
-   the rangelist to the log stream given (such as LOG_MACHINE or LOG_XML) */
+   in sequential order for space savings and easier to read output.  Outputs the
+   rangelist to the log stream given (such as LOG_MACHINE or LOG_XML) */
 static void output_rangelist_given_ports(int logt, unsigned short *ports,
-						    int numports) {
-int i, previous_port = -2, range_start = -2, port;
-char outpbuf[128];
+                                         int numports) {
+  int i, previous_port = -2, range_start = -2, port;
+  char outpbuf[128];
 
- for(i=0; i <= numports; i++) {
-   port = (i < numports)? ports[i] : 0xABCDE;
-   if (port != previous_port + 1) {
-     outpbuf[0] = '\0';
-     if (range_start != previous_port && range_start != -2)
-       sprintf(outpbuf, "-%hu", previous_port);
-     if (port != 0xABCDE) {
-       if (range_start != -2)
-	 strcat(outpbuf, ",");
-       sprintf(outpbuf + strlen(outpbuf), "%hu", port);
-     }
-     if (*outpbuf)
-       log_write(logt, "%s", outpbuf);
-     range_start = port;
-   }
-   previous_port = port;
- }
+  for (i = 0; i <= numports; i++) {
+    port = (i < numports) ? ports[i] : 0xABCDE;
+    if (port != previous_port + 1) {
+      outpbuf[0] = '\0';
+      if (range_start != previous_port && range_start != -2)
+        sprintf(outpbuf, "-%hu", previous_port);
+      if (port != 0xABCDE) {
+        if (range_start != -2)
+          strcat(outpbuf, ",");
+        sprintf(outpbuf + strlen(outpbuf), "%hu", port);
+      }
+      if (*outpbuf)
+        log_write(logt, "%s", outpbuf);
+      range_start = port;
+    }
+    previous_port = port;
+  }
 }
 
 /* Output the list of ports scanned to the top of machine parseable
    logs (in a comment, unfortunately).  The items in ports should be
    in sequential order for space savings and easier to read output */
-void output_ports_to_machine_parseable_output(struct scan_lists *ports, 
-					      int tcpscan, int udpscan,
-					      int sctpscan, int protscan) {
+void output_ports_to_machine_parseable_output(struct scan_lists *ports,
+                                              int tcpscan, int udpscan,
+                                              int sctpscan, int protscan) {
   int tcpportsscanned = ports->tcp_count;
   int udpportsscanned = ports->udp_count;
   int sctpportsscanned = ports->sctp_count;
   int protsscanned = ports->prot_count;
- log_write(LOG_MACHINE, "# Ports scanned: TCP(%d;", tcpportsscanned);
- if (tcpportsscanned)
-   output_rangelist_given_ports(LOG_MACHINE, ports->tcp_ports, tcpportsscanned);
- log_write(LOG_MACHINE, ") UDP(%d;", udpportsscanned);
- if (udpportsscanned)
-   output_rangelist_given_ports(LOG_MACHINE, ports->udp_ports, udpportsscanned);
- log_write(LOG_MACHINE, ") SCTP(%d;", sctpportsscanned);
- if (sctpportsscanned)
-   output_rangelist_given_ports(LOG_MACHINE, ports->sctp_ports, sctpportsscanned);
- log_write(LOG_MACHINE, ") PROTOCOLS(%d;", protsscanned);
- if (protsscanned)
-   output_rangelist_given_ports(LOG_MACHINE, ports->prots, protsscanned);
- log_write(LOG_MACHINE, ")\n");
- log_flush_all();
+  log_write(LOG_MACHINE, "# Ports scanned: TCP(%d;", tcpportsscanned);
+  if (tcpportsscanned)
+    output_rangelist_given_ports(LOG_MACHINE, ports->tcp_ports, tcpportsscanned);
+  log_write(LOG_MACHINE, ") UDP(%d;", udpportsscanned);
+  if (udpportsscanned)
+    output_rangelist_given_ports(LOG_MACHINE, ports->udp_ports, udpportsscanned);
+  log_write(LOG_MACHINE, ") SCTP(%d;", sctpportsscanned);
+  if (sctpportsscanned)
+    output_rangelist_given_ports(LOG_MACHINE, ports->sctp_ports, sctpportsscanned);
+  log_write(LOG_MACHINE, ") PROTOCOLS(%d;", protsscanned);
+  if (protsscanned)
+    output_rangelist_given_ports(LOG_MACHINE, ports->prots, protsscanned);
+  log_write(LOG_MACHINE, ")\n");
+  log_flush_all();
 }
 
 //A simple helper function for doscaninfo handles the c14n of o.scanflags
-static void doscanflags(){
-    struct {
-      unsigned char flag;
-      const char *name;
-    } flags[] = {
-      { TH_FIN, "FIN" }, { TH_SYN, "SYN" }, { TH_RST, "RST" },
-      { TH_PUSH, "PSH" }, { TH_ACK, "ACK" }, { TH_URG, "URG" },
-      { TH_ECE, "ECE" }, { TH_CWR, "CWR" }
-    };
-    if(o.scanflags!=-1){
-      log_write(LOG_XML, "scanflags=\"");
-      for(unsigned int i=0;i<sizeof(flags) / sizeof(flags[0]);i++){
-        if(o.scanflags & flags[i].flag){
-          log_write(LOG_XML, "%s",flags[i].name);
-        }
+static void doscanflags() {
+  struct {
+    unsigned char flag;
+    const char *name;
+  } flags[] = {
+    {
+    TH_FIN, "FIN"}, {
+    TH_SYN, "SYN"}, {
+    TH_RST, "RST"}, {
+    TH_PUSH, "PSH"}, {
+    TH_ACK, "ACK"}, {
+    TH_URG, "URG"}, {
+    TH_ECE, "ECE"}, {
+    TH_CWR, "CWR"}
+  };
+  if (o.scanflags != -1) {
+    log_write(LOG_XML, "scanflags=\"");
+    for (unsigned int i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
+      if (o.scanflags & flags[i].flag) {
+        log_write(LOG_XML, "%s", flags[i].name);
       }
-      log_write(LOG_XML, "\"");
     }
+    log_write(LOG_XML, "\"");
+  }
 }
 
 /* Simple helper function for output_xml_scaninfo_records */
-static void doscaninfo(const char *type, const char *proto, unsigned short *ports, 
-		  int numports) {
+static void doscaninfo(const char *type, const char *proto,
+                       unsigned short *ports, int numports) {
   log_write(LOG_XML, "<scaninfo type=\"%s\" ", type);
-  if(strncmp(proto,"tcp",3)==0){
-	doscanflags();
+  if (strncmp(proto, "tcp", 3) == 0) {
+    doscanflags();
   }
-  log_write(LOG_XML, " protocol=\"%s\" numservices=\"%d\" services=\"", proto, numports);
+  log_write(LOG_XML, " protocol=\"%s\" numservices=\"%d\" services=\"",
+            proto, numports);
   output_rangelist_given_ports(LOG_XML, ports, numports);
   log_write(LOG_XML, "\" />\n");
 }
@@ -1263,11 +1337,11 @@ static void doscaninfo(const char *type, const char *proto, unsigned short *port
    outputs the XML version, which is scaninfo records of each scan
    requested and the ports which it will scan for */
 void output_xml_scaninfo_records(struct scan_lists *scanlist) {
-  if (o.synscan) 
+  if (o.synscan)
     doscaninfo("syn", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
-  if (o.ackscan) 
+  if (o.ackscan)
     doscaninfo("ack", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
-  if (o.bouncescan) 
+  if (o.bouncescan)
     doscaninfo("bounce", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
   if (o.connectscan)
     doscaninfo("connect", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
@@ -1277,23 +1351,23 @@ void output_xml_scaninfo_records(struct scan_lists *scanlist) {
     doscaninfo("xmas", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
   if (o.windowscan)
     doscaninfo("window", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
-  if (o.maimonscan) 
+  if (o.maimonscan)
     doscaninfo("maimon", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
-  if (o.finscan) 
+  if (o.finscan)
     doscaninfo("fin", "tcp", scanlist->tcp_ports, scanlist->tcp_count);
-  if (o.udpscan) 
+  if (o.udpscan)
     doscaninfo("udp", "udp", scanlist->udp_ports, scanlist->udp_count);
-  if (o.sctpinitscan) 
+  if (o.sctpinitscan)
     doscaninfo("sctpinit", "sctp", scanlist->sctp_ports, scanlist->sctp_count);
-  if (o.sctpcookieechoscan) 
+  if (o.sctpcookieechoscan)
     doscaninfo("sctpcookieecho", "sctp", scanlist->sctp_ports, scanlist->sctp_count);
-  if (o.ipprotscan) 
-    doscaninfo("ipproto", "ip", scanlist->prots, scanlist->prot_count); 
+  if (o.ipprotscan)
+    doscaninfo("ipproto", "ip", scanlist->prots, scanlist->prot_count);
   log_flush_all();
 }
 
 /* Prints the MAC address (if discovered) to XML output */
-static void print_MAC_XML_Info(Target *currenths) {
+static void print_MAC_XML_Info(Target * currenths) {
   const u8 *mac = currenths->MACAddress();
   char macascii[32];
   char vendorstr[128];
@@ -1302,29 +1376,38 @@ static void print_MAC_XML_Info(Target *currenths) {
   if (mac) {
     const char *macvendor = MACPrefix2Corp(mac);
     Snprintf(macascii, sizeof(macascii), "%02X:%02X:%02X:%02X:%02X:%02X",
-	     mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+             mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
     if (macvendor) {
       xml_mac = xml_convert(macvendor);
       Snprintf(vendorstr, sizeof(vendorstr), " vendor=\"%s\"", xml_mac);
       free(xml_mac);
-    } else vendorstr[0] = '\0';
-    log_write(LOG_XML, "<address addr=\"%s\" addrtype=\"mac\"%s />\n", macascii, vendorstr);
+    } else
+      vendorstr[0] = '\0';
+    log_write(LOG_XML, "<address addr=\"%s\" addrtype=\"mac\"%s />\n",
+              macascii, vendorstr);
   }
 }
 
-/* Helper function to write the status and address/hostname info of a host 
+/* Helper function to write the status and address/hostname info of a host
    into the XML log */
-static void write_xml_initial_hostinfo(Target *currenths,
-				  const char *status) {
-  
-  log_write(LOG_XML,"<status state=\"%s\" reason=\"%s\"/>\n", status, reason_str(currenths->reason.reason_id, SINGULAR));
-  log_write(LOG_XML,"<address addr=\"%s\" addrtype=\"%s\" />\n", currenths->targetipstr(), (o.af() == AF_INET)? "ipv4" : "ipv6");
+static void write_xml_initial_hostinfo(Target * currenths,
+                                       const char *status) {
+  log_write(LOG_XML, "<status state=\"%s\" reason=\"%s\"/>\n", status,
+            reason_str(currenths->reason.reason_id, SINGULAR));
+  log_write(LOG_XML, "<address addr=\"%s\" addrtype=\"%s\" />\n",
+            currenths->targetipstr(),
+            (o.af() == AF_INET) ? "ipv4" : "ipv6");
   print_MAC_XML_Info(currenths);
   if (*currenths->HostName()) {
-    log_write(LOG_XML, "<hostnames><hostname name=\"%s\" type=\"PTR\" /></hostnames>\n", currenths->HostName());
-  } else /* If machine is up, put blank hostname so front ends know that
-	    no name resolution is forthcoming */
-    if (strcmp(status, "up") == 0) log_write(LOG_XML, "<hostnames />\n");
+    log_write(LOG_XML,
+              "<hostnames><hostname name=\"%s\" type=\"PTR\" /></hostnames>\n",
+              currenths->HostName());
+  } else {
+    /* If machine is up, put blank hostname so front ends know that no name
+       resolution is forthcoming */
+    if (strcmp(status, "up") == 0)
+      log_write(LOG_XML, "<hostnames />\n");
+  }
   log_flush_all();
 }
 
@@ -1351,58 +1434,64 @@ static char *num_to_string_sigdigits(double d, int digits) {
 }
 
 /* Writes host status info to the log streams (including STDOUT).  An
-   example is "Host: 10.11.12.13 (foo.bar.example.com)\tStatus: Up\n" to 
+   example is "Host: 10.11.12.13 (foo.bar.example.com)\tStatus: Up\n" to
    machine log.  resolve_all should be passed nonzero if the user asked
    for all hosts (even down ones) to be resolved */
-void write_host_status(Target *currenths, int resolve_all) {
+void write_host_status(Target * currenths, int resolve_all) {
   char hostname[1200];
 
   if (o.listscan) {
     /* write "unknown" to stdout, machine, and xml */
-    log_write(LOG_PLAIN, "Host %s not scanned\n", currenths->NameIP(hostname, sizeof(hostname)));
-    log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Unknown\n", currenths->targetipstr(), currenths->HostName());
+    log_write(LOG_PLAIN, "Host %s not scanned\n",
+              currenths->NameIP(hostname, sizeof(hostname)));
+    log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Unknown\n",
+              currenths->targetipstr(), currenths->HostName());
     write_xml_initial_hostinfo(currenths, "unknown");
-  } 
-
-  else if (currenths->weird_responses) { /* SMURF ADDRESS */
+  } else if (currenths->weird_responses) {
+    /* SMURF ADDRESS */
     /* Write xml "down" or "up" based on flags and the smurf info */
-    write_xml_initial_hostinfo(currenths, 
-			       (currenths->flags & HOST_UP)? "up" : "down");
-    log_write(LOG_XML, "<smurf responses=\"%d\" />\n", 
-	      currenths->weird_responses);
-    log_write(LOG_MACHINE,"Host: %s (%s)\tStatus: Smurf (%d responses)\n",  currenths->targetipstr(), currenths->HostName(), currenths->weird_responses);
-    
-    if (o.noportscan)
-      log_write(LOG_PLAIN,"Host %s seems to be a subnet broadcast address (returned %d extra pings).%s\n",  currenths->NameIP(hostname, sizeof(hostname)), currenths->weird_responses, 
-		(currenths->flags & HOST_UP)? " Note -- the actual IP also responded." : "");
-    else {
-      log_write(LOG_PLAIN,"Host %s seems to be a subnet broadcast address (returned %d extra pings). %s.\n",  
-		currenths->NameIP(hostname, sizeof(hostname)),
-		currenths->weird_responses,
-	       (currenths->flags & HOST_UP)? 
-		" Still scanning it due to ping response from its own IP" 
-		: "Skipping host");
+    write_xml_initial_hostinfo(currenths,
+                               (currenths->
+                                flags & HOST_UP) ? "up" : "down");
+    log_write(LOG_XML, "<smurf responses=\"%d\" />\n",
+              currenths->weird_responses);
+    log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Smurf (%d responses)\n",
+              currenths->targetipstr(), currenths->HostName(),
+              currenths->weird_responses);
+
+    if (o.noportscan) {
+      log_write(LOG_PLAIN, "Host %s seems to be a subnet broadcast address (returned %d extra pings).%s\n",
+                currenths->NameIP(hostname, sizeof(hostname)),
+                currenths->weird_responses,
+                (currenths->flags & HOST_UP) ? " Note -- the actual IP also responded." : "");
+    } else {
+      log_write(LOG_PLAIN, "Host %s seems to be a subnet broadcast address (returned %d extra pings). %s.\n",
+                currenths->NameIP(hostname, sizeof(hostname)),
+                currenths->weird_responses,
+                (currenths->flags & HOST_UP) ? " Still scanning it due to ping response from its own IP" : "Skipping host");
     }
-  } 
+  } else {
+    /* Ping scan / port scan. */
 
-  else {  /* Ping scan / port scan. */
-
-    write_xml_initial_hostinfo(currenths, 
-			       (currenths->flags & HOST_UP)? "up" : "down");
+    write_xml_initial_hostinfo(currenths, (currenths->flags & HOST_UP) ? "up" : "down");
     if (o.noportscan || o.verbose) {
       if (currenths->flags & HOST_UP) {
-        log_write(LOG_PLAIN, "Host %s is up", currenths->NameIP(hostname, sizeof(hostname)));
+        log_write(LOG_PLAIN, "Host %s is up",
+                  currenths->NameIP(hostname, sizeof(hostname)));
         if (o.reason)
           log_write(LOG_PLAIN, ", %s", target_reason_str(currenths));
         if (currenths->to.srtt != -1)
-          log_write(LOG_PLAIN, " (%ss latency)", num_to_string_sigdigits(currenths->to.srtt / 1000000.0, 2));
+          log_write(LOG_PLAIN, " (%ss latency)",
+                    num_to_string_sigdigits(currenths->to.srtt / 1000000.0, 2));
         log_write(LOG_PLAIN, ".\n");
 
-        log_write(LOG_MACHINE,"Host: %s (%s)\tStatus: Up\n", currenths->targetipstr(), currenths->HostName());
+        log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Up\n",
+                  currenths->targetipstr(), currenths->HostName());
       } else if (o.verbose || resolve_all) {
         log_write(resolve_all ? LOG_PLAIN : LOG_STDOUT,
-                  "Host %s is down.\n", currenths->NameIP(hostname, sizeof(hostname)));
-        log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Down\n", currenths->targetipstr(), currenths->HostName());
+                  "Host %s is down.\n", currenths->NameIP(hostname, sizeof (hostname)));
+        log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Down\n",
+                  currenths->targetipstr(), currenths->HostName());
       }
     }
   }
@@ -1413,17 +1502,18 @@ void write_host_status(Target *currenths, int resolve_all) {
    that only unique entries are added.  Also note that *numentries is
    incremented if the candidate is added.  arrsize is the number of
    char * members that fit into arr */
-static int addtochararrayifnew(char *arr[], int *numentries, int arrsize, char *candidate) {
+static int addtochararrayifnew(char *arr[], int *numentries, int arrsize,
+                               char *candidate) {
   int i;
 
   // First lets see if the member already exists
-  for(i=0; i < *numentries; i++) {
+  for (i = 0; i < *numentries; i++) {
     if (strcmp(arr[i], candidate) == 0)
       return *numentries;
   }
 
   // Not already there... do we have room for a new one?
-  if (*numentries >= arrsize )
+  if (*numentries >= arrsize)
     return -1;
 
   // OK, not already there and we have room, so we'll add it.
@@ -1434,17 +1524,19 @@ static int addtochararrayifnew(char *arr[], int *numentries, int arrsize, char *
 
 /* guess is true if we should print guesses */
 #define MAX_OS_CLASSMEMBERS 8
-static void printosclassificationoutput(const struct OS_Classification_Results *OSR, bool guess) {
+static void printosclassificationoutput(const struct
+                                        OS_Classification_Results *OSR,
+                                        bool guess) {
   int classno, i, familyno;
-   int overflow = 0; /* Whether we have too many devices to list */
+  int overflow = 0;             /* Whether we have too many devices to list */
   char *types[MAX_OS_CLASSMEMBERS];
-  char fullfamily[MAX_OS_CLASSMEMBERS][128]; // "[vendor] [os family]"
-  double familyaccuracy[MAX_OS_CLASSMEMBERS]; // highest accuracy for this fullfamily
-  char familygenerations[MAX_OS_CLASSMEMBERS][48]; // example: "4.X|5.X|6.X"
-  int numtypes = 0, numfamilies=0;
+  char fullfamily[MAX_OS_CLASSMEMBERS][128];    // "[vendor] [os family]"
+  double familyaccuracy[MAX_OS_CLASSMEMBERS];   // highest accuracy for this fullfamily
+  char familygenerations[MAX_OS_CLASSMEMBERS][48];      // example: "4.X|5.X|6.X"
+  int numtypes = 0, numfamilies = 0;
   char tmpbuf[1024];
 
-  for(i=0; i < MAX_OS_CLASSMEMBERS; i++) {
+  for (i = 0; i < MAX_OS_CLASSMEMBERS; i++) {
     familygenerations[i][0] = '\0';
     familyaccuracy[i] = 0.0;
   }
@@ -1452,85 +1544,100 @@ static void printosclassificationoutput(const struct OS_Classification_Results *
   if (OSR->overall_results == OSSCAN_SUCCESS) {
 
     /* Print the OS Classification results to XML output */
-    for (classno=0; classno < OSR->OSC_num_matches; classno++) {
+    for (classno = 0; classno < OSR->OSC_num_matches; classno++) {
       // Because the OS_Generation filed is optional
       if (OSR->OSC[classno]->OS_Generation) {
-	Snprintf(tmpbuf, sizeof(tmpbuf), " osgen=\"%s\"", OSR->OSC[classno]->OS_Generation);
-      } else tmpbuf[0] = '\0';
+        Snprintf(tmpbuf, sizeof(tmpbuf), " osgen=\"%s\"",
+                 OSR->OSC[classno]->OS_Generation);
+      } else {
+        tmpbuf[0] = '\0';
+      }
       {
-	char *xml_type, *xml_vendor, *xml_class;
-	xml_type = xml_convert(OSR->OSC[classno]->Device_Type);
-	xml_vendor = xml_convert(OSR->OSC[classno]->OS_Vendor);
-	xml_class = xml_convert(OSR->OSC[classno]->OS_Family);
-	log_write(LOG_XML, "<osclass type=\"%s\" vendor=\"%s\" osfamily=\"%s\"%s accuracy=\"%d\" />\n", xml_type, xml_vendor, xml_class, tmpbuf, (int) (OSR->OSC_Accuracy[classno] * 100));
-	free(xml_type);
-	free(xml_vendor);
-	free(xml_class);
+        char *xml_type, *xml_vendor, *xml_class;
+        xml_type = xml_convert(OSR->OSC[classno]->Device_Type);
+        xml_vendor = xml_convert(OSR->OSC[classno]->OS_Vendor);
+        xml_class = xml_convert(OSR->OSC[classno]->OS_Family);
+        log_write(LOG_XML,
+                  "<osclass type=\"%s\" vendor=\"%s\" osfamily=\"%s\"%s accuracy=\"%d\" />\n",
+                  xml_type, xml_vendor, xml_class, tmpbuf,
+                  (int) (OSR->OSC_Accuracy[classno] * 100));
+        free(xml_type);
+        free(xml_vendor);
+        free(xml_class);
       }
     }
 
     // Now to create the fodder for normal output
-    for (classno=0; classno < OSR->OSC_num_matches; classno++) {
+    for (classno = 0; classno < OSR->OSC_num_matches; classno++) {
       /* We have processed enough if any of the following are true */
       if ((!guess && OSR->OSC_Accuracy[classno] < 1.0) ||
-	  OSR->OSC_Accuracy[classno] <= OSR->OSC_Accuracy[0] - 0.1 ||
-	  (OSR->OSC_Accuracy[classno] < 1.0 && classno > 9))
-	break;
-      if (addtochararrayifnew(types, &numtypes, MAX_OS_CLASSMEMBERS, OSR->OSC[classno]->Device_Type) == -1)
-	overflow = 1;
-      
+          OSR->OSC_Accuracy[classno] <= OSR->OSC_Accuracy[0] - 0.1 ||
+          (OSR->OSC_Accuracy[classno] < 1.0 && classno > 9))
+        break;
+      if (addtochararrayifnew(types, &numtypes, MAX_OS_CLASSMEMBERS,
+                              OSR->OSC[classno]->Device_Type) == -1) {
+        overflow = 1;
+      }
+
       // If family and vendor names are the same, no point being redundant
       if (strcmp(OSR->OSC[classno]->OS_Vendor, OSR->OSC[classno]->OS_Family) == 0)
-	Strncpy(tmpbuf, OSR->OSC[classno]->OS_Family, sizeof(tmpbuf));
-      else Snprintf(tmpbuf, sizeof(tmpbuf), "%s %s", OSR->OSC[classno]->OS_Vendor, OSR->OSC[classno]->OS_Family);
-      
-      
+        Strncpy(tmpbuf, OSR->OSC[classno]->OS_Family, sizeof(tmpbuf));
+      else
+        Snprintf(tmpbuf, sizeof(tmpbuf), "%s %s", OSR->OSC[classno]->OS_Vendor, OSR->OSC[classno]->OS_Family);
+
+
       // Let's see if it is already in the array
-      for(familyno = 0; familyno < numfamilies; familyno++) {
-	if (strcmp(fullfamily[familyno], tmpbuf) == 0) {
-	  // got a match ... do we need to add the generation?
-	  if (OSR->OSC[classno]->OS_Generation && !strstr(familygenerations[familyno], OSR->OSC[classno]->OS_Generation)) {
-	    int flen = strlen(familygenerations[familyno]);
-	    // We add it, preceded by | if something is already there
-	    if (flen + 2 + strlen(OSR->OSC[classno]->OS_Generation) >= 
-		sizeof(familygenerations[familyno])) 
-	      fatal("buffer 0verfl0w of familygenerations");
-	    if (*familygenerations[familyno]) 
-	      strcat(familygenerations[familyno], "|");
-	    strncat(familygenerations[familyno], 
-		    OSR->OSC[classno]->OS_Generation, 
-		    sizeof(familygenerations[familyno]) - flen - 1);
-	  }
-	  break;
-	}
+      for (familyno = 0; familyno < numfamilies; familyno++) {
+        if (strcmp(fullfamily[familyno], tmpbuf) == 0) {
+          // got a match ... do we need to add the generation?
+          if (OSR->OSC[classno]->OS_Generation
+              && !strstr(familygenerations[familyno],
+                         OSR->OSC[classno]->OS_Generation)) {
+            int flen = strlen(familygenerations[familyno]);
+            // We add it, preceded by | if something is already there
+            if (flen + 2 + strlen(OSR->OSC[classno]->OS_Generation) >=
+                sizeof(familygenerations[familyno]))
+              fatal("buffer 0verfl0w of familygenerations");
+            if (*familygenerations[familyno])
+              strcat(familygenerations[familyno], "|");
+            strncat(familygenerations[familyno],
+                    OSR->OSC[classno]->OS_Generation,
+                    sizeof(familygenerations[familyno]) - flen - 1);
+          }
+          break;
+        }
       }
-      
+
       if (familyno == numfamilies) {
-	// Looks like the new family is not in the list yet.  Do we have room to add it?
-	if (numfamilies >= MAX_OS_CLASSMEMBERS) {
-	  overflow = 1;
-	  break;
-	}
-	
-	// Have space, time to add...
-	Strncpy(fullfamily[numfamilies], tmpbuf, 128);
-	if (OSR->OSC[classno]->OS_Generation)
-	  Strncpy(familygenerations[numfamilies], OSR->OSC[classno]->OS_Generation, 48);
-	familyaccuracy[numfamilies] = OSR->OSC_Accuracy[classno];
-	numfamilies++;
+        // Looks like the new family is not in the list yet.  Do we have room to add it?
+        if (numfamilies >= MAX_OS_CLASSMEMBERS) {
+          overflow = 1;
+          break;
+        }
+        // Have space, time to add...
+        Strncpy(fullfamily[numfamilies], tmpbuf, 128);
+        if (OSR->OSC[classno]->OS_Generation)
+          Strncpy(familygenerations[numfamilies],
+                  OSR->OSC[classno]->OS_Generation, 48);
+        familyaccuracy[numfamilies] = OSR->OSC_Accuracy[classno];
+        numfamilies++;
       }
     }
-    
+
     if (!overflow && numfamilies >= 1) {
       log_write(LOG_PLAIN, "Device type: ");
-      for(classno=0; classno < numtypes; classno++)
-	log_write(LOG_PLAIN, "%s%s", types[classno], (classno < numtypes - 1)? "|" : "");
-      log_write(LOG_PLAIN, "\nRunning%s: ", (familyaccuracy[0] < 1.0)? " (JUST GUESSING) " : "");
-      for(familyno = 0; familyno < numfamilies; familyno++) {
-	if (familyno > 0) log_write(LOG_PLAIN, ", ");
-	log_write(LOG_PLAIN, "%s", fullfamily[familyno]);
-	if (*familygenerations[familyno]) log_write(LOG_PLAIN, " %s", familygenerations[familyno]);
-	if (familyaccuracy[familyno] < 1.0) log_write(LOG_PLAIN, " (%.f%%)", floor(familyaccuracy[familyno] * 100));
+      for (classno = 0; classno < numtypes; classno++)
+        log_write(LOG_PLAIN, "%s%s", types[classno], (classno < numtypes - 1) ? "|" : "");
+      log_write(LOG_PLAIN, "\nRunning%s: ", (familyaccuracy[0] < 1.0) ? " (JUST GUESSING) " : "");
+      for (familyno = 0; familyno < numfamilies; familyno++) {
+        if (familyno > 0)
+          log_write(LOG_PLAIN, ", ");
+        log_write(LOG_PLAIN, "%s", fullfamily[familyno]);
+        if (*familygenerations[familyno])
+          log_write(LOG_PLAIN, " %s", familygenerations[familyno]);
+        if (familyaccuracy[familyno] < 1.0)
+          log_write(LOG_PLAIN, " (%.f%%)",
+                    floor(familyaccuracy[familyno] * 100));
       }
       log_write(LOG_PLAIN, "\n");
     }
@@ -1544,106 +1651,110 @@ static void printosclassificationoutput(const struct OS_Classification_Results *
    network.  This only prints to human output -- XML is handled by a
    separate call ( print_MAC_XML_Info ) because it needs to be printed
    in a certain place to conform to DTD. */
-void printmacinfo(Target *currenths) {
+void printmacinfo(Target * currenths) {
   const u8 *mac = currenths->MACAddress();
   char macascii[32];
 
   if (mac) {
     const char *macvendor = MACPrefix2Corp(mac);
-    Snprintf(macascii, sizeof(macascii), "%02X:%02X:%02X:%02X:%02X:%02X",  mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-    log_write(LOG_PLAIN, "MAC Address: %s (%s)\n", macascii, macvendor? macvendor : "Unknown");
+    Snprintf(macascii, sizeof(macascii), "%02X:%02X:%02X:%02X:%02X:%02X",
+             mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+    log_write(LOG_PLAIN, "MAC Address: %s (%s)\n", macascii,
+              macvendor ? macvendor : "Unknown");
   }
 }
 
 
 
 /* A convenience wrapper around mergeFPs. */
-static const char *merge_fpr(const FingerPrintResults *FPR,
-                             const Target *currenths,
+static const char *merge_fpr(const FingerPrintResults * FPR,
+                             const Target * currenths,
                              bool isGoodFP, bool wrapit) {
   return mergeFPs(FPR->FPs, FPR->numFPs, isGoodFP, currenths->v4hostip(),
-                  currenths->distance, currenths->distance_calculation_method,
+                  currenths->distance,
+                  currenths->distance_calculation_method,
                   currenths->MACAddress(), FPR->osscan_opentcpport,
-                  FPR->osscan_closedtcpport, FPR->osscan_closedudpport, wrapit);
+                  FPR->osscan_closedtcpport, FPR->osscan_closedudpport,
+                  wrapit);
 }
 
-static void write_merged_fpr(const FingerPrintResults *FPR,
-                             const Target *currenths,
+static void write_merged_fpr(const FingerPrintResults * FPR,
+                             const Target * currenths,
                              bool isGoodFP, bool wrapit) {
-  log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT, "TCP/IP fingerprint:\n%s\n",
+  log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
+            "TCP/IP fingerprint:\n%s\n",
             merge_fpr(FPR, currenths, isGoodFP, wrapit));
 
-  /* Added code here to print fingerprint to XML file any time it would be printed
-     to any other output format  */
-  char *xml_osfp = xml_convert(merge_fpr(FPR, currenths,  isGoodFP,  wrapit));
-  log_write(LOG_XML,"<osfingerprint fingerprint=\"%s\" />\n", xml_osfp);
+  /* Added code here to print fingerprint to XML file any time it would be
+     printed to any other output format  */
+  char *xml_osfp = xml_convert(merge_fpr(FPR, currenths, isGoodFP, wrapit));
+  log_write(LOG_XML, "<osfingerprint fingerprint=\"%s\" />\n", xml_osfp);
   free(xml_osfp);
-
 }
 
 /* Prints the formatted OS Scan output to stdout, logfiles, etc (but only
    if an OS Scan was performed).*/
-void printosscanoutput(Target *currenths) {
+void printosscanoutput(Target * currenths) {
   int i;
-  char numlst[512]; /* For creating lists of numbers */
-  char *p; /* Used in manipulating numlst above */
+  char numlst[512];             /* For creating lists of numbers */
+  char *p;                      /* Used in manipulating numlst above */
   FingerPrintResults *FPR;
   int osscan_flag;
-  
+
   if (!(osscan_flag = currenths->osscanPerformed()))
     return;
-   
+
   if (currenths->FPR == NULL)
     return;
   FPR = currenths->FPR;
 
   log_write(LOG_XML, "<os>");
   if (FPR->osscan_opentcpport > 0) {
-    log_write(LOG_XML, 
-	      "<portused state=\"open\" proto=\"tcp\" portid=\"%hu\" />\n",
-	      FPR->osscan_opentcpport);
+    log_write(LOG_XML,
+              "<portused state=\"open\" proto=\"tcp\" portid=\"%hu\" />\n",
+              FPR->osscan_opentcpport);
   }
   if (FPR->osscan_closedtcpport > 0) {
-    log_write(LOG_XML, 
-	      "<portused state=\"closed\" proto=\"tcp\" portid=\"%hu\" />\n",
-	      FPR->osscan_closedtcpport);
+    log_write(LOG_XML,
+              "<portused state=\"closed\" proto=\"tcp\" portid=\"%hu\" />\n",
+              FPR->osscan_closedtcpport);
   }
   if (FPR->osscan_closedudpport > 0) {
-    log_write(LOG_XML, 
-	      "<portused state=\"closed\" proto=\"udp\" portid=\"%hu\" />\n",
-	      FPR->osscan_closedudpport);
+    log_write(LOG_XML,
+              "<portused state=\"closed\" proto=\"udp\" portid=\"%hu\" />\n",
+              FPR->osscan_closedudpport);
   }
 
-  if(osscan_flag == OS_PERF_UNREL && 
-     !(FPR->overall_results == OSSCAN_TOOMANYMATCHES ||
-     (FPR->num_perfect_matches > 8 && !o.debugging)))
-	log_write(LOG_PLAIN, "Warning: OSScan results may be unreliable because we could not find at least 1 open and 1 closed port\n");
+  if (osscan_flag == OS_PERF_UNREL &&
+      !(FPR->overall_results == OSSCAN_TOOMANYMATCHES ||
+        (FPR->num_perfect_matches > 8 && !o.debugging)))
+    log_write(LOG_PLAIN, "Warning: OSScan results may be unreliable because we could not find at least 1 open and 1 closed port\n");
 
   // If the FP can't be submitted anyway, might as well make a guess.
   const char *reason = FPR->OmitSubmissionFP();
-  printosclassificationoutput(FPR->getOSClassification(), 
-			      o.osscan_guess || reason);
-  
-  if (FPR->overall_results == OSSCAN_SUCCESS && 
+  printosclassificationoutput(FPR->getOSClassification(), o.osscan_guess || reason);
+
+  if (FPR->overall_results == OSSCAN_SUCCESS &&
       (FPR->num_perfect_matches <= 8 || o.debugging)) {
     /* Success, not too many perfect matches. */
     if (FPR->num_perfect_matches > 0) {
       /* Some perfect matches. */
       for (i = 0; FPR->accuracy[i] == 1; i++) {
         char *p;
-        log_write(LOG_XML, "<osmatch name=\"%s\" accuracy=\"100\" line=\"%d\" />\n", 
+        log_write(LOG_XML,
+                  "<osmatch name=\"%s\" accuracy=\"100\" line=\"%d\" />\n",
                   p = xml_convert(FPR->prints[i]->OS_name),
                   FPR->prints[i]->line);
         free(p);
       }
 
-      log_write(LOG_MACHINE,"\tOS: %s",  FPR->prints[0]->OS_name);
+      log_write(LOG_MACHINE, "\tOS: %s", FPR->prints[0]->OS_name);
       for (i = 1; FPR->accuracy[i] == 1; i++)
-        log_write(LOG_MACHINE,"|%s", FPR->prints[i]->OS_name);
+        log_write(LOG_MACHINE, "|%s", FPR->prints[i]->OS_name);
 
       log_write(LOG_PLAIN, "OS details: %s", FPR->prints[0]->OS_name);
       for (i = 1; FPR->accuracy[i] == 1; i++)
-        log_write(LOG_PLAIN,", %s", FPR->prints[i]->OS_name);
+        log_write(LOG_PLAIN, ", %s", FPR->prints[i]->OS_name);
       log_write(LOG_PLAIN, "\n");
 
       if (o.debugging || o.verbose > 1)
@@ -1651,32 +1762,35 @@ void printosscanoutput(Target *currenths) {
     } else {
       /* No perfect matches. */
       if ((o.verbose > 1 || o.debugging) && reason)
-        log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,
+        log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
                   "OS fingerprint not ideal because: %s\n", reason);
 
       if ((o.osscan_guess || reason) && FPR->num_matches > 0) {
         /* Print the best guesses available */
         for (i = 0; i < 10 && i < FPR->num_matches && FPR->accuracy[i] > FPR->accuracy[0] - 0.10; i++) {
           char *p;
-          log_write(LOG_XML, "<osmatch name=\"%s\" accuracy=\"%d\" line=\"%d\"/>\n", 
-                    p = xml_convert(FPR->prints[i]->OS_name),  
-                    (int) (FPR->accuracy[i] * 100), 
-                    FPR->prints[i]->line);
+          log_write(LOG_XML,
+                    "<osmatch name=\"%s\" accuracy=\"%d\" line=\"%d\"/>\n",
+                    p = xml_convert(FPR->prints[i]->OS_name),
+                    (int) (FPR->accuracy[i] * 100), FPR->prints[i]->line);
           free(p);
         }
 
-        log_write(LOG_PLAIN,"Aggressive OS guesses: %s (%.f%%)", FPR->prints[0]->OS_name, floor(FPR->accuracy[0] * 100));
+        log_write(LOG_PLAIN, "Aggressive OS guesses: %s (%.f%%)",
+                  FPR->prints[0]->OS_name, floor(FPR->accuracy[0] * 100));
         for (i = 1; i < 10 && FPR->num_matches > i && FPR->accuracy[i] > FPR->accuracy[0] - 0.10; i++)
-          log_write(LOG_PLAIN,", %s (%.f%%)", FPR->prints[i]->OS_name, floor(FPR->accuracy[i] * 100));
+          log_write(LOG_PLAIN, ", %s (%.f%%)", FPR->prints[i]->OS_name, floor(FPR->accuracy[i] * 100));
 
         log_write(LOG_PLAIN, "\n");
       }
 
       if (!reason) {
-        log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No exact OS matches for host (If you know what OS is running on it, see http://nmap.org/submit/ ).\n");
+        log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
+                  "No exact OS matches for host (If you know what OS is running on it, see http://nmap.org/submit/ ).\n");
         write_merged_fpr(FPR, currenths, true, true);
       } else {
-        log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No exact OS matches for host (test conditions non-ideal).\n");
+        log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
+                  "No exact OS matches for host (test conditions non-ideal).\n");
         if (o.verbose > 1 || o.debugging)
           write_merged_fpr(FPR, currenths, false, false);
       }
@@ -1684,25 +1798,30 @@ void printosscanoutput(Target *currenths) {
   } else if (FPR->overall_results == OSSCAN_NOMATCHES) {
     /* No matches at all. */
     if (!reason) {
-      log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No OS matches for host (If you know what OS is running on it, see http://nmap.org/submit/ ).\n");
+      log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
+                "No OS matches for host (If you know what OS is running on it, see http://nmap.org/submit/ ).\n");
       write_merged_fpr(FPR, currenths, true, true);
     } else {
-      log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"OS fingerprint not ideal because: %s\n", reason);
-      log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No OS matches for host\n");
+      log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
+                "OS fingerprint not ideal because: %s\n", reason);
+      log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
+                "No OS matches for host\n");
       if (o.debugging || o.verbose > 1)
         write_merged_fpr(FPR, currenths, false, false);
     }
-  } else if (FPR->overall_results == OSSCAN_TOOMANYMATCHES || (FPR->num_perfect_matches > 8 && !o.debugging)) {
+  } else if (FPR->overall_results == OSSCAN_TOOMANYMATCHES
+             || (FPR->num_perfect_matches > 8 && !o.debugging)) {
     /* Too many perfect matches. */
-    log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"Too many fingerprints match this host to give specific OS details\n");
+    log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
+              "Too many fingerprints match this host to give specific OS details\n");
     if (o.debugging || o.verbose > 1)
       write_merged_fpr(FPR, currenths, false, false);
   } else {
     assert(0);
   }
-  
+
   log_write(LOG_XML, "</os>\n");
-  
+
   if (currenths->seq.lastboot) {
     char tmbuf[128];
     struct timeval tv;
@@ -1712,56 +1831,73 @@ void printosscanoutput(Target *currenths) {
     chomp(tmbuf);
     gettimeofday(&tv, NULL);
     if (o.verbose)
-      log_write(LOG_PLAIN,"Uptime guess: %.3f days (since %s)\n", (double) (tv.tv_sec - currenths->seq.lastboot) / 86400, tmbuf);
-    log_write(LOG_XML, "<uptime seconds=\"%li\" lastboot=\"%s\" />\n", tv.tv_sec - currenths->seq.lastboot, tmbuf);
+      log_write(LOG_PLAIN, "Uptime guess: %.3f days (since %s)\n",
+                (double) (tv.tv_sec - currenths->seq.lastboot) / 86400,
+                tmbuf);
+    log_write(LOG_XML, "<uptime seconds=\"%li\" lastboot=\"%s\" />\n",
+              tv.tv_sec - currenths->seq.lastboot, tmbuf);
   }
-  
-  if (currenths->distance!=-1) {
-    log_write(LOG_PLAIN, "Network Distance: %d hop%s\n", currenths->distance, (currenths->distance == 1)? "" : "s");
+
+  if (currenths->distance != -1) {
+    log_write(LOG_PLAIN, "Network Distance: %d hop%s\n",
+              currenths->distance, (currenths->distance == 1) ? "" : "s");
     log_write(LOG_XML, "<distance value=\"%d\" />\n", currenths->distance);
   }
-  
+
   if (currenths->seq.responses > 3) {
-    p=numlst;
-    for(i=0; i < currenths->seq.responses; i++) {
-      if (p - numlst > (int) (sizeof(numlst) - 15)) 
-	fatal("STRANGE ERROR #3877 -- please report to fyodor@insecure.org\n");
-      if (p != numlst) *p++=',';
+    p = numlst;
+    for (i = 0; i < currenths->seq.responses; i++) {
+      if (p - numlst > (int) (sizeof(numlst) - 15))
+        fatal("STRANGE ERROR #3877 -- please report to fyodor@insecure.org\n");
+      if (p != numlst)
+        *p++ = ',';
       sprintf(p, "%X", currenths->seq.seqs[i]);
-      while(*p) p++;
+      while (*p)
+        p++;
     }
-    
-    log_write(LOG_XML, "<tcpsequence index=\"%li\" difficulty=\"%s\" values=\"%s\" />\n", (long) currenths->seq.index, seqidx2difficultystr(currenths->seq.index), numlst); 
+
+    log_write(LOG_XML,
+              "<tcpsequence index=\"%li\" difficulty=\"%s\" values=\"%s\" />\n",
+              (long) currenths->seq.index,
+              seqidx2difficultystr(currenths->seq.index), numlst);
     if (o.verbose)
-      log_write(LOG_PLAIN,"%s", seqreport(&(currenths->seq)));
-    
-    log_write(LOG_MACHINE,"\tSeq Index: %d", currenths->seq.index);
+      log_write(LOG_PLAIN, "%s", seqreport(&(currenths->seq)));
+
+    log_write(LOG_MACHINE, "\tSeq Index: %d", currenths->seq.index);
   }
-  
+
   if (currenths->seq.responses > 2) {
-    p=numlst;
-    for(i=0; i < currenths->seq.responses; i++) {
-      if (p - numlst > (int) (sizeof(numlst) - 15)) 
-	fatal("STRANGE ERROR #3876 -- please report to fyodor@insecure.org\n");
-      if (p != numlst) *p++=',';
+    p = numlst;
+    for (i = 0; i < currenths->seq.responses; i++) {
+      if (p - numlst > (int) (sizeof(numlst) - 15))
+        fatal("STRANGE ERROR #3876 -- please report to fyodor@insecure.org\n");
+      if (p != numlst)
+        *p++ = ',';
       sprintf(p, "%hX", currenths->seq.ipids[i]);
-      while(*p) p++;
+      while (*p)
+        p++;
     }
-    log_write(LOG_XML, "<ipidsequence class=\"%s\" values=\"%s\" />\n", ipidclass2ascii(currenths->seq.ipid_seqclass), numlst);
+    log_write(LOG_XML, "<ipidsequence class=\"%s\" values=\"%s\" />\n",
+              ipidclass2ascii(currenths->seq.ipid_seqclass), numlst);
     if (o.verbose)
-      log_write(LOG_PLAIN,"IP ID Sequence Generation: %s\n", ipidclass2ascii(currenths->seq.ipid_seqclass));
-    log_write(LOG_MACHINE,"\tIP ID Seq: %s", ipidclass2ascii(currenths->seq.ipid_seqclass));
-    
-    p=numlst;
-    for(i=0; i < currenths->seq.responses; i++) {
-      if (p - numlst > (int) (sizeof(numlst) - 15)) 
-	fatal("STRANGE ERROR #3877 -- please report to fyodor@insecure.org\n");
-      if (p != numlst) *p++=',';
+      log_write(LOG_PLAIN, "IP ID Sequence Generation: %s\n",
+                ipidclass2ascii(currenths->seq.ipid_seqclass));
+    log_write(LOG_MACHINE, "\tIP ID Seq: %s",
+              ipidclass2ascii(currenths->seq.ipid_seqclass));
+
+    p = numlst;
+    for (i = 0; i < currenths->seq.responses; i++) {
+      if (p - numlst > (int) (sizeof(numlst) - 15))
+        fatal("STRANGE ERROR #3877 -- please report to fyodor@insecure.org\n");
+      if (p != numlst)
+        *p++ = ',';
       sprintf(p, "%X", currenths->seq.timestamps[i]);
-      while(*p) p++;
+      while (*p)
+        p++;
     }
-    
-    log_write(LOG_XML, "<tcptssequence class=\"%s\"", tsseqclass2ascii(currenths->seq.ts_seqclass));
+
+    log_write(LOG_XML, "<tcptssequence class=\"%s\"",
+              tsseqclass2ascii(currenths->seq.ts_seqclass));
     if (currenths->seq.ts_seqclass != TS_SEQ_UNSUPPORTED) {
       log_write(LOG_XML, " values=\"%s\"", numlst);
     }
@@ -1773,34 +1909,32 @@ void printosscanoutput(Target *currenths) {
 /* An auxillary function for printserviceinfooutput(). Returns
    non-zero if a and b are considered the same hostnames. */
 static int hostcmp(const char *a, const char *b) {
-  return strcasestr(a, b)? 1 : 0;
+  return strcasestr(a, b) ? 1 : 0;
 }
 
-
-/* Prints the alternate hostname/OS/device information we got from the
- *    service scan (if it was performed) */
-void printserviceinfooutput(Target *currenths) {
-
+/* Prints the alternate hostname/OS/device information we got from the service
+   scan (if it was performed) */
+void printserviceinfooutput(Target * currenths) {
   Port *p = NULL;
   struct serviceDeductions sd;
-  int i, numhostnames=0, numostypes=0, numdevicetypes=0;
+  int i, numhostnames = 0, numostypes = 0, numdevicetypes = 0;
   char hostname_tbl[MAX_SERVICE_INFO_FIELDS][MAXHOSTNAMELEN];
   char ostype_tbl[MAX_SERVICE_INFO_FIELDS][64];
   char devicetype_tbl[MAX_SERVICE_INFO_FIELDS][64];
   const char *delim;
 
-  for (i=0; i<MAX_SERVICE_INFO_FIELDS; i++)
+  for (i = 0; i < MAX_SERVICE_INFO_FIELDS; i++)
     hostname_tbl[i][0] = ostype_tbl[i][0] = devicetype_tbl[i][0] = '\0';
 
   while ((p = currenths->ports.nextPort(p, TCPANDUDPANDSCTP, PORT_OPEN))) {
-    // The following 2 lines (from portlist.h) tell us that we don't
-    // need to worry about free()ing anything in the serviceDeductions struct.
-      // pass in an allocated struct serviceDeductions (don't wory about initializing, and
-      // you don't have to free any internal ptrs.
+    // The following 2 lines (from portlist.h) tell us that we don't need to
+    // worry about free()ing anything in the serviceDeductions struct. pass in
+    // an allocated struct serviceDeductions (don't wory about initializing, and
+    // you don't have to free any internal ptrs.
     p->getServiceDeductions(&sd);
 
     if (sd.hostname && !hostcmp(currenths->HostName(), sd.hostname)) {
-      for (i=0; i<MAX_SERVICE_INFO_FIELDS; i++) {
+      for (i = 0; i < MAX_SERVICE_INFO_FIELDS; i++) {
         if (hostname_tbl[i][0] && hostcmp(&hostname_tbl[i][0], sd.hostname))
           break;
 
@@ -1813,7 +1947,7 @@ void printserviceinfooutput(Target *currenths) {
     }
 
     if (sd.ostype) {
-      for (i=0; i<MAX_SERVICE_INFO_FIELDS; i++) {
+      for (i = 0; i < MAX_SERVICE_INFO_FIELDS; i++) {
         if (ostype_tbl[i][0] && !strcmp(&ostype_tbl[i][0], sd.ostype))
           break;
 
@@ -1826,7 +1960,7 @@ void printserviceinfooutput(Target *currenths) {
     }
 
     if (sd.devicetype) {
-      for (i=0; i<MAX_SERVICE_INFO_FIELDS; i++) {
+      for (i = 0; i < MAX_SERVICE_INFO_FIELDS; i++) {
         if (devicetype_tbl[i][0] && !strcmp(&devicetype_tbl[i][0], sd.devicetype))
           break;
 
@@ -1840,33 +1974,39 @@ void printserviceinfooutput(Target *currenths) {
 
   }
 
-  if (!numhostnames && !numostypes && !numdevicetypes) return;
+  if (!numhostnames && !numostypes && !numdevicetypes)
+    return;
 
   log_write(LOG_PLAIN, "Service Info:");
 
   delim = " ";
   if (numhostnames) {
-    log_write(LOG_PLAIN, "%sHost%s: %s", delim, numhostnames==1? "" : "s", &hostname_tbl[0][0]);
-    for (i=1; i<MAX_SERVICE_INFO_FIELDS; i++)
+    log_write(LOG_PLAIN, "%sHost%s: %s", delim, numhostnames == 1 ? "" : "s", &hostname_tbl[0][0]);
+    for (i = 1; i < MAX_SERVICE_INFO_FIELDS; i++) {
       if (hostname_tbl[i][0])
         log_write(LOG_PLAIN, ", %s", &hostname_tbl[i][0]);
-    delim="; ";
+    }
+    delim = "; ";
   }
 
   if (numostypes) {
-    log_write(LOG_PLAIN, "%sOS%s: %s", delim, numostypes==1? "" : "s", &ostype_tbl[0][0]);
-    for (i=1; i<MAX_SERVICE_INFO_FIELDS; i++)
+    log_write(LOG_PLAIN, "%sOS%s: %s", delim, numostypes == 1 ? "" : "s",
+              &ostype_tbl[0][0]);
+    for (i = 1; i < MAX_SERVICE_INFO_FIELDS; i++) {
       if (ostype_tbl[i][0])
         log_write(LOG_PLAIN, ", %s", &ostype_tbl[i][0]);
-    delim="; ";
+    }
+    delim = "; ";
   }
 
   if (numdevicetypes) {
-    log_write(LOG_PLAIN, "%sDevice%s: %s", delim, numdevicetypes==1? "" : "s", &devicetype_tbl[0][0]);
-    for (i=1; i<MAX_SERVICE_INFO_FIELDS; i++)
+    log_write(LOG_PLAIN, "%sDevice%s: %s", delim,
+              numdevicetypes == 1 ? "" : "s", &devicetype_tbl[0][0]);
+    for (i = 1; i < MAX_SERVICE_INFO_FIELDS; i++) {
       if (devicetype_tbl[i][0])
         log_write(LOG_PLAIN, ", %s", &devicetype_tbl[i][0]);
-    delim="; ";
+    }
+    delim = "; ";
   }
 
   log_write(LOG_PLAIN, "\n");
@@ -1874,35 +2014,37 @@ void printserviceinfooutput(Target *currenths) {
 }
 
 #ifndef NOLUA
-void printhostscriptresults(Target *currenths) {
-	ScriptResults::iterator iter;
-	char* script_output, *xml_id, *xml_scriptoutput; 
-	
-	if(currenths->scriptResults.size() > 0) {
-		log_write(LOG_XML, "<hostscript>");
-		log_write(LOG_PLAIN, "\nHost script results:\n");
-		for(iter = currenths->scriptResults.begin(); iter != currenths->scriptResults.end(); iter++) {
-			xml_id = xml_convert(iter->get_id().c_str());
-			xml_scriptoutput= xml_convert(iter->get_output().c_str());
-			log_write(LOG_XML, "<script id=\"%s\" output=\"%s\" />", 
-					xml_id, xml_scriptoutput);
-			script_output = formatScriptOutput((*iter));
-			log_write(LOG_PLAIN, "%s\n", script_output);
-			free(script_output);
-			free(xml_id);
-			free(xml_scriptoutput);
-		}
-		log_write(LOG_XML, "</hostscript>");
-	}
+void printhostscriptresults(Target * currenths) {
+  ScriptResults::iterator iter;
+  char *script_output, *xml_id, *xml_scriptoutput;
+
+  if (currenths->scriptResults.size() > 0) {
+    log_write(LOG_XML, "<hostscript>");
+    log_write(LOG_PLAIN, "\nHost script results:\n");
+    for (iter = currenths->scriptResults.begin();
+         iter != currenths->scriptResults.end();
+         iter++) {
+      xml_id = xml_convert(iter->get_id().c_str());
+      xml_scriptoutput = xml_convert(iter->get_output().c_str());
+      log_write(LOG_XML, "<script id=\"%s\" output=\"%s\" />",
+                xml_id, xml_scriptoutput);
+      script_output = formatScriptOutput((*iter));
+      log_write(LOG_PLAIN, "%s\n", script_output);
+      free(script_output);
+      free(xml_id);
+      free(xml_scriptoutput);
+    }
+    log_write(LOG_XML, "</hostscript>");
+  }
 }
 #endif
 
 /* Print a table with traceroute hops. */
-static void printtraceroute_normal(Target *currenths) {
+static void printtraceroute_normal(Target * currenths) {
   static const int HOP_COL = 0, RTT_COL = 1, HOST_COL = 2;
   NmapOutputTable Tbl(currenths->traceroute_hops.size() + 1, 3);
   struct probespec probe;
-  list <TracerouteHop>::iterator it;
+  list<TracerouteHop>::iterator it;
   int row;
 
   /* No trace, must be localhost. */
@@ -1914,17 +2056,17 @@ static void printtraceroute_normal(Target *currenths) {
   probe = currenths->traceroute_probespec;
   if (probe.type == PS_TCP) {
     log_write(LOG_PLAIN, "TRACEROUTE (using port %d/%s)\n",
-      probe.pd.tcp.dport, proto2ascii(probe.proto));
+              probe.pd.tcp.dport, proto2ascii(probe.proto));
   } else if (probe.type == PS_UDP) {
     log_write(LOG_PLAIN, "TRACEROUTE (using port %d/%s)\n",
-      probe.pd.udp.dport, proto2ascii(probe.proto));
+              probe.pd.udp.dport, proto2ascii(probe.proto));
   } else if (probe.type == PS_SCTP) {
     log_write(LOG_PLAIN, "TRACEROUTE (using port %d/%s)\n",
-      probe.pd.sctp.dport, proto2ascii(probe.proto));
+              probe.pd.sctp.dport, proto2ascii(probe.proto));
   } else if (probe.type == PS_ICMP || probe.type == PS_PROTO) {
     struct protoent *proto = nmap_getprotbynum(htons(probe.proto));
     log_write(LOG_PLAIN, "TRACEROUTE (using proto %d/%s)\n",
-      probe.proto, proto ? proto->p_name : "unknown");
+              probe.proto, proto ? proto->p_name : "unknown");
   }
 
   row = 0;
@@ -1944,7 +2086,7 @@ static void printtraceroute_normal(Target *currenths) {
     sslen = sizeof(addr);
     currenths->TargetSockAddr(&addr, &sslen);
     while (it != currenths->traceroute_hops.end()
-      && sockaddr_storage_cmp(&it->tag, &addr) != 0) {
+           && sockaddr_storage_cmp(&it->tag, &addr) != 0) {
       shared_hop = &*it;
       it++;
     }
@@ -1952,7 +2094,8 @@ static void printtraceroute_normal(Target *currenths) {
     if (shared_hop != NULL) {
       Tbl.addItem(row, HOP_COL, false, "-");
       if (shared_hop->ttl == 1) {
-        Tbl.addItemFormatted(row, RTT_COL, true, "Hop 1 is the same as for %s",
+        Tbl.addItemFormatted(row, RTT_COL, true,
+          "Hop 1 is the same as for %s",
           inet_ntop_ez(&shared_hop->tag, sizeof(shared_hop->tag)));
       } else if (shared_hop->ttl > 1) {
         Tbl.addItemFormatted(row, RTT_COL, true,
@@ -1973,7 +2116,7 @@ static void printtraceroute_normal(Target *currenths) {
         /* The beginning and end of timeout consolidation. */
         int begin_ttl, end_ttl;
         begin_ttl = end_ttl = it->ttl;
-        for (; it != currenths->traceroute_hops.end() && it->timedout; it++)
+        for ( ; it != currenths->traceroute_hops.end() && it->timedout; it++)
           end_ttl = it->ttl;
         if (begin_ttl == end_ttl)
           Tbl.addItem(row, RTT_COL, false, "...");
@@ -1982,8 +2125,8 @@ static void printtraceroute_normal(Target *currenths) {
       }
       row++;
     } else {
-      char namebuf[256];
       /* Normal hop output. */
+      char namebuf[256];
 
       it->display_name(namebuf, sizeof(namebuf));
       if (it->rtt < 0)
@@ -2001,9 +2144,9 @@ static void printtraceroute_normal(Target *currenths) {
   log_flush(LOG_PLAIN);
 }
 
-static void printtraceroute_xml(Target *currenths) {
+static void printtraceroute_xml(Target * currenths) {
   struct probespec probe;
-  list <TracerouteHop>::iterator it;
+  list<TracerouteHop>::iterator it;
 
   /* No trace, must be localhost. */
   if (currenths->traceroute_hops.size() == 0)
@@ -2013,20 +2156,20 @@ static void printtraceroute_xml(Target *currenths) {
   log_write(LOG_XML, "<trace ");
   probe = currenths->traceroute_probespec;
   if (probe.type == PS_TCP) {
-      log_write(LOG_XML, "port=\"%d\" proto=\"%s\"",
-        probe.pd.tcp.dport, proto2ascii(probe.proto));
+    log_write(LOG_XML, "port=\"%d\" proto=\"%s\"",
+              probe.pd.tcp.dport, proto2ascii(probe.proto));
   } else if (probe.type == PS_UDP) {
-      log_write(LOG_XML, "port=\"%d\" proto=\"%s\"",
-        probe.pd.udp.dport, proto2ascii(probe.proto));
+    log_write(LOG_XML, "port=\"%d\" proto=\"%s\"",
+              probe.pd.udp.dport, proto2ascii(probe.proto));
   } else if (probe.type == PS_SCTP) {
-      log_write(LOG_XML, "port=\"%d\" proto=\"%s\"",
-        probe.pd.sctp.dport, proto2ascii(probe.proto));
+    log_write(LOG_XML, "port=\"%d\" proto=\"%s\"",
+              probe.pd.sctp.dport, proto2ascii(probe.proto));
   } else if (probe.type == PS_ICMP || probe.type == PS_PROTO) {
-      struct protoent *proto = nmap_getprotbynum(htons(probe.proto));
-      if (proto == NULL)
-          log_write(LOG_XML, "proto=\"%d\"", probe.proto);
-      else
-          log_write(LOG_XML, "proto=\"%s\"", proto->p_name);
+    struct protoent *proto = nmap_getprotbynum(htons(probe.proto));
+    if (proto == NULL)
+      log_write(LOG_XML, "proto=\"%d\"", probe.proto);
+    else
+      log_write(LOG_XML, "proto=\"%s\"", proto->p_name);
   }
   log_write(LOG_XML, ">\n");
 
@@ -2036,7 +2179,7 @@ static void printtraceroute_xml(Target *currenths) {
     if (it->timedout)
       continue;
     log_write(LOG_XML, "<hop ttl=\"%d\" ipaddr=\"%s\"",
-      it->ttl, inet_ntop_ez(&it->addr, sizeof(it->addr)));
+              it->ttl, inet_ntop_ez(&it->addr, sizeof(it->addr)));
     if (it->rtt < 0)
       log_write(LOG_XML, " rtt=\"--\"");
     else
@@ -2047,18 +2190,18 @@ static void printtraceroute_xml(Target *currenths) {
   }
 
   /*
-  if (tg->getState() == G_DEAD_TTL)
-      log_write(LOG_XML, "<error errorstr=\"maximum TTL reached\"/>\n");
-  else if (!tg->gotReply || (tp && (tp->ipreplysrc.s_addr != tg->ipdst)))
-      log_write(LOG_XML, "<error errorstr=\"destination not reached (%s)\"/>\n", inet_ntoa(tp->ipdst));
-  */
+     if (tg->getState() == G_DEAD_TTL)
+     log_write(LOG_XML, "<error errorstr=\"maximum TTL reached\"/>\n");
+     else if (!tg->gotReply || (tp && (tp->ipreplysrc.s_addr != tg->ipdst)))
+     log_write(LOG_XML, "<error errorstr=\"destination not reached (%s)\"/>\n", inet_ntoa(tp->ipdst));
+   */
 
   /* traceroute XML footer */
   log_write(LOG_XML, "</trace>\n");
   log_flush(LOG_XML);
 }
 
-void printtraceroute(Target *currenths) {
+void printtraceroute(Target * currenths) {
   printtraceroute_normal(currenths);
   printtraceroute_xml(currenths);
 }
@@ -2069,11 +2212,11 @@ void printStatusMessage() {
   struct timeval tv;
   gettimeofday(&tv, NULL);
   int time = (int) (o.TimeSinceStartMS(&tv) / 1000.0);
-  
-  log_write(LOG_STDOUT, 
-	    "Stats: %d:%02d:%02d elapsed; %d hosts completed (%d up), %d undergoing %s\n", 
-	    time/60/60, time/60 % 60, time % 60, o.numhosts_scanned, 
-	    o.numhosts_up, o.numhosts_scanning, scantype2str(o.current_scantype));
+
+  log_write(LOG_STDOUT, "Stats: %d:%02d:%02d elapsed; %d hosts completed (%d up), %d undergoing %s\n",
+            time / 60 / 60, time / 60 % 60, time % 60, o.numhosts_scanned,
+            o.numhosts_up, o.numhosts_scanning,
+            scantype2str(o.current_scantype));
 }
 
 
@@ -2092,9 +2235,9 @@ void printfinaloutput() {
 #ifndef NOLUA
       && o.scriptupdatedb == 0
 #endif
-     )
+      )
     error("WARNING: No targets were specified, so 0 hosts scanned.");
-  if (o.numhosts_scanned == 1 && o.numhosts_up == 0 && !o.listscan && 
+  if (o.numhosts_scanned == 1 && o.numhosts_up == 0 && !o.listscan &&
       o.pingtype != PINGTYPE_NONE)
     log_write(LOG_STDOUT, "Note: Host seems down. If it is really up, but blocking our ping probes, try -PN\n");
   else if (o.numhosts_up > 0) {
@@ -2106,18 +2249,37 @@ void printfinaloutput() {
       log_write(LOG_PLAIN, "Service detection performed. Please report any incorrect results at http://nmap.org/submit/ .\n");
   }
 
-  log_write(LOG_STDOUT|LOG_SKID, "Nmap done: %d %s (%d %s up) scanned in %.2f seconds\n", o.numhosts_scanned, (o.numhosts_scanned == 1)? "IP address" : "IP addresses", o.numhosts_up, (o.numhosts_up == 1)? "host" : "hosts",  o.TimeSinceStartMS(&tv) / 1000.0);
-  if (o.verbose && o.isr00t && o.RawScan()) 
-    log_write(LOG_STDOUT|LOG_SKID, "           %s\n", 
-	      getFinalPacketStats(statbuf, sizeof(statbuf)));
+  log_write(LOG_STDOUT | LOG_SKID,
+            "Nmap done: %d %s (%d %s up) scanned in %.2f seconds\n",
+            o.numhosts_scanned,
+            (o.numhosts_scanned == 1) ? "IP address" : "IP addresses",
+            o.numhosts_up, (o.numhosts_up == 1) ? "host" : "hosts",
+            o.TimeSinceStartMS(&tv) / 1000.0);
+  if (o.verbose && o.isr00t && o.RawScan())
+    log_write(LOG_STDOUT | LOG_SKID, "           %s\n",
+              getFinalPacketStats(statbuf, sizeof(statbuf)));
 
   Strncpy(mytime, ctime(&timep), sizeof(mytime));
   chomp(mytime);
-  
-  log_write(LOG_XML, "<runstats><finished time=\"%lu\" timestr=\"%s\" elapsed=\"%.2f\"/><hosts up=\"%d\" down=\"%d\" total=\"%d\" />\n", (unsigned long) timep, mytime, o.TimeSinceStartMS(&tv) / 1000.0, o.numhosts_up, o.numhosts_scanned - o.numhosts_up, o.numhosts_scanned);
 
-  log_write(LOG_XML, "<!-- Nmap done at %s; %d %s (%d %s up) scanned in %.2f seconds -->\n", mytime, o.numhosts_scanned, (o.numhosts_scanned == 1)? "IP address" : "IP addresses", o.numhosts_up, (o.numhosts_up == 1)? "host" : "hosts",  o.TimeSinceStartMS(&tv) / 1000.0 );
-  log_write(LOG_NORMAL|LOG_MACHINE, "# Nmap done at %s -- %d %s (%d %s up) scanned in %.2f seconds\n", mytime, o.numhosts_scanned, (o.numhosts_scanned == 1)? "IP address" : "IP addresses", o.numhosts_up, (o.numhosts_up == 1)? "host" : "hosts", o.TimeSinceStartMS(&tv) / 1000.0 );
+  log_write(LOG_XML,
+            "<runstats><finished time=\"%lu\" timestr=\"%s\" elapsed=\"%.2f\"/><hosts up=\"%d\" down=\"%d\" total=\"%d\" />\n",
+            (unsigned long) timep, mytime,
+            o.TimeSinceStartMS(&tv) / 1000.0, o.numhosts_up,
+            o.numhosts_scanned - o.numhosts_up, o.numhosts_scanned);
+
+  log_write(LOG_XML,
+            "<!-- Nmap done at %s; %d %s (%d %s up) scanned in %.2f seconds -->\n",
+            mytime, o.numhosts_scanned,
+            (o.numhosts_scanned == 1) ? "IP address" : "IP addresses",
+            o.numhosts_up, (o.numhosts_up == 1) ? "host" : "hosts",
+            o.TimeSinceStartMS(&tv) / 1000.0);
+  log_write(LOG_NORMAL | LOG_MACHINE,
+            "# Nmap done at %s -- %d %s (%d %s up) scanned in %.2f seconds\n",
+            mytime, o.numhosts_scanned,
+            (o.numhosts_scanned == 1) ? "IP address" : "IP addresses",
+            o.numhosts_up, (o.numhosts_up == 1) ? "host" : "hosts",
+            o.TimeSinceStartMS(&tv) / 1000.0);
 
   log_write(LOG_XML, "</runstats></nmaprun>\n");
   log_flush_all();
@@ -2134,7 +2296,7 @@ struct data_file_record {
 
   /* Compares this record to another. First compare the directory names, then
      compare the file names. */
-  bool operator<(const struct data_file_record& other) {
+  bool operator<(const struct data_file_record &other) {
     int cmp;
 
     cmp = dir.compare(other.dir);
@@ -2156,7 +2318,8 @@ void printdatafilepaths() {
 
   /* Copy the elements of o.loaded_data_files (each a (data file, path) pair) to
      a list of data_file_records to make them easier to manipulate. */
-  for (map_iter = o.loaded_data_files.begin(); map_iter != o.loaded_data_files.end(); map_iter++) {
+  for (map_iter = o.loaded_data_files.begin();
+       map_iter != o.loaded_data_files.end(); map_iter++) {
     struct data_file_record r;
     char *s;
 
@@ -2205,7 +2368,7 @@ void printdatafilepaths() {
     /* If all the files were from the same directory and we're in verbose mode,
        print a brief message unless we are also in debugging mode. */
     log_write(LOG_PLAIN, "Read data files from: %s\n", dir.c_str());
-  } else if ( (num_dirs == 1 && o.debugging) || num_dirs > 1) {
+  } else if ((num_dirs == 1 && o.debugging) || num_dirs > 1) {
     /* If files were read from more than one directory, or if they were read
        from one directory and we are in debugging mode, display all the files
        grouped by directory. */