Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain.

[metze/wireshark/wip.git] / clopts_common.c

diff --git a/clopts_common.c b/clopts_common.c
index 411c59cce1c65eb3d7bea9355039a0b197076bb1..4143013bdafacce1e9dbe2f3cc6f758aa0f205d0 100644 (file)
--- a/clopts_common.c
+++ b/clopts_common.c
@@ -19,19 +19,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
-
-#include <epan/proto.h>
-#include <epan/packet.h>
-#include <epan/prefs.h>
+#include <stdlib.h>
 
 #include "clopts_common.h"
 #include "cmdarg_err.h"
@@ -56,14 +51,14 @@ get_natural_int(const char *string, const char *name)
               name, string, INT_MAX);
     exit(1);
   }
-  return number;
+  return (int)number;
 }
 
 
 int
 get_positive_int(const char *string, const char *name)
 {
-  long number;
+  int number;
 
   number = get_natural_int(string, name);
 
@@ -74,50 +69,3 @@ get_positive_int(const char *string, const char *name)
 
   return number;
 }
-
-gint64
-get_natural_int64(const char *string, const char *name)
-{
-  gint64 number;
-  char *p;
-
-#if GLIB_CHECK_VERSION(2,12,0)
-  number = g_ascii_strtoll(string, &p, 10);
-#elif defined(HAVE_STRTOLL)
-  number = strtoll(string, &p, 10);
-#else
-  /* Punt and grab a 32-bit value */
-  number = strtol(string, &p, 10);
-#endif
-
-  if (p == string || *p != '\0') {
-    cmdarg_err("The specified %s \"%s\" isn't a decimal number", name, string);
-    exit(1);
-  }
-  if (number < 0) {
-    cmdarg_err("The specified %s \"%s\" is a negative number", name, string);
-    exit(1);
-  }
-  if (number > G_MAXINT64) { /* XXX - ??? */
-    cmdarg_err("The specified %s \"%s\" is too large (greater than %" G_GINT64_MODIFIER "d)",
-              name, string, G_MAXINT64);
-    exit(1);
-  }
-  return number;
-}
-
-
-gint64
-get_positive_int64(const char *string, const char *name)
-{
-  gint64 number;
-
-  number = get_natural_int64(string, name);
-
-  if (number == 0) {
-    cmdarg_err("The specified %s is zero", name);
-    exit(1);
-  }
-
-  return number;
-}