From 8de1fda6b33c1f0fe26e2f322f8c9a3917d52f22 Mon Sep 17 00:00:00 2001
From: kris <kris@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 15 Nov 2007 22:42:17 +0000
Subject: [PATCH] Removing numberlist2array(); it's unused since David switched
 the ping port selection to use the same mechanism as port scans (e.g. using
 -PShttp*).

---
 utils.cc | 56 --------------------------------------------------------
 utils.h  | 11 -----------
 2 files changed, 67 deletions(-)

diff --git a/utils.cc b/utils.cc
index dc46b8e10..059229806 100644
--- a/utils.cc
+++ b/utils.cc
@@ -270,62 +270,6 @@ int optcmp(const char *a, const char *b) {
   return 0;
 }
 
-/* Convert a comma-separated list of ASCII u16-sized numbers into the
-   given 'dest' array, which is of total size (meaning sizeof() as
-   opposed to numelements) of destsize.  If min_elem and max_elem are
-   provided, each number must be within (or equal to) those
-   constraints.  The number of numbers stored in 'dest' is returned,
-   except that -1 is returned in the case of an error. If -1 is
-   returned and errorstr is non-null, *errorstr is filled with a ptr to a
-   static string literal describing the error. */
-
-int numberlist2array(char *expr, u16 *dest, int destsize, char **errorstr, u16 min_elem, u16 max_elem) {
-  char *current_range;
-  char *endptr;
-  char *errbogus;
-  long val;
-  int max_vals = destsize / 2;
-  int num_vals_saved = 0;
-  current_range = expr;
-
-  if (!errorstr)
-    errorstr = &errbogus;
-
-  if (destsize % 2 != 0) {
-    *errorstr = "Bogus call to numberlist2array() -- destsize must be a multiple of 2";
-    return -1;
-  }
-
-  if (!expr || !*expr)
-    return 0;
-
-  do {
-    if (num_vals_saved == max_vals) {
-      *errorstr = "Buffer would overflow -- too many numbers in provided list";
-      return -1;
-    }
-    if( !isdigit((int) *current_range) ) {
-      *errorstr = "Alleged number begins with nondigit!  Example of proper form: \"20,80,65532\"";
-      return -1;
-    }
-    val = strtol(current_range, &endptr, 10);
-    if( val < min_elem || val > max_elem ) {
-      *errorstr = "Number given in list is outside given legal range";
-      return -1;
-    }
-    dest[num_vals_saved++] = (u16) val;
-    current_range = endptr;
-    while (*current_range == ',' || isspace(*current_range))
-      current_range++;
-    if (*current_range && !isdigit(*current_range)) {
-      *errorstr = "Bogus character in supposed number-list string. Example of proper form: \"20,80,65532\"";
-      return -1;
-    }
-  } while( current_range && *current_range);
-
-  return num_vals_saved;
-}
-
 /* Scramble the contents of an array*/
 void genfry(unsigned char *arr, int elem_sz, int num_elem) {
 int i;
diff --git a/utils.h b/utils.h
index 81c671542..00be9fb3b 100644
--- a/utils.h
+++ b/utils.h
@@ -255,17 +255,6 @@ char* print_ip_options(u8* ipopt, int ipoptlen);
 char *strerror(int errnum);
 #endif
 
-/* Convert a comma-separated list of ASCII u16-sized numbers into the
-   given 'dest' array, which is of total size (meaning sizeof() as
-   opposed to numelements) of destsize.  If min_elem and max_elem are
-   provided, each number must be within (or equal to) those
-   constraints.  The number of numbers stored in 'dest' is returned,
-   except that -1 is returned in the case of an error. If -1 is
-   returned and errorstr is non-null, *errorstr is filled with a ptr to a
-   static string literal describing the error. */
-int numberlist2array(char *expr, u16 *dest, int destsize, char **errorstr, 
-		     u16 min_elem=0, u16 max_elem=65535);
-
 /* mmap() an entire file into the address space.  Returns a pointer
    to the beginning of the file.  The mmap'ed length is returned
    inside the length parameter.  If there is a problem, NULL is