summaryrefslogtreecommitdiff
path: root/mergecap.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-10-05 15:22:34 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-10-05 15:22:34 +0000
commit41a8561936c2698f0ad4d54497802e2b5ac7aa07 (patch)
tree4f2b6340d76614145bcf3394ee597f6d40ee3372 /mergecap.c
parent8fe2c2d41865267427c11787080edd91152b54ee (diff)
downloadwireshark-41a8561936c2698f0ad4d54497802e2b5ac7aa07.tar.gz
Fixed a int/long warning.
svn path=/trunk/; revision=30330
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mergecap.c b/mergecap.c
index 358ebe2359..2f493c895e 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -42,10 +42,10 @@
static int
get_natural_int(const char *string, const char *name)
{
- long number;
+ int number;
char *p;
- number = strtol(string, &p, 10);
+ number = (int) strtol(string, &p, 10);
if (p == string || *p != '\0') {
fprintf(stderr, "mergecap: The specified %s \"%s\" isn't a decimal number\n",
name, string);
@@ -67,7 +67,7 @@ get_natural_int(const char *string, const char *name)
static int
get_positive_int(const char *string, const char *name)
{
- long number;
+ int number;
number = get_natural_int(string, name);