From 6eb37db01bcd61333d02cc024d7f508ef8ef5e94 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 20 Jun 2012 23:08:33 +0000
Subject: [PATCH] Simplify output_rangelist_given_ports.

---
 output.cc | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/output.cc b/output.cc
index 4cfd9e74b..75b636c96 100644
--- a/output.cc
+++ b/output.cc
@@ -1075,25 +1075,20 @@ int log_open(int logt, int append, char *filename) {
    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 start, end;
 
-  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;
+  start = 0;
+  while (start < numports) {
+    end = start;
+    while (end + 1 < numports && ports[end + 1] == ports[end] + 1)
+      end++;
+    if (start > 0)
+      log_write(logt, ",");
+    if (start == end)
+      log_write(logt, "%hu", ports[start]);
+    else
+      log_write(logt, "%hu-%hu", ports[start], ports[end]);
+    start = end + 1;
   }
 }