summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editcap.c7
-rw-r--r--epan/proto.c6
-rw-r--r--extcap/extcap-base.c4
-rw-r--r--extcap/randpktdump.c2
-rw-r--r--rawshark.c2
-rw-r--r--ui/cli/tap-follow.c8
-rw-r--r--ui/win32/file_dlg_win32.c2
7 files changed, 16 insertions, 15 deletions
diff --git a/editcap.c b/editcap.c
index 5a106a630a..52d74f637e 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1,4 +1,5 @@
-/* Edit capture files. We can delete packets, adjust timestamps, or
+/* editcap.c
+ * Edit capture files. We can delete packets, adjust timestamps, or
* simply convert from one format to another format.
*
* Originally written by Richard Sharpe.
@@ -287,7 +288,7 @@ add_selection(char *sel, guint* max_selection)
*max_selection = selectfrm[max_selected].first;
if (verbose)
- fprintf(stderr, " %i\n", selectfrm[max_selected].first);
+ fprintf(stderr, " %u\n", selectfrm[max_selected].first);
} else {
if (verbose)
fprintf(stderr, "Inclusive ...");
@@ -306,7 +307,7 @@ add_selection(char *sel, guint* max_selection)
*max_selection = selectfrm[max_selected].second;
if (verbose)
- fprintf(stderr, " %i, %i\n", selectfrm[max_selected].first,
+ fprintf(stderr, " %u, %u\n", selectfrm[max_selected].first,
selectfrm[max_selected].second);
}
diff --git a/epan/proto.c b/epan/proto.c
index 07574aa324..aa457649b3 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -8416,15 +8416,15 @@ proto_registrar_dump_fieldcount(void)
gpa_hfinfo.len, deregistered_count, protocol_count,
same_name_count);
- printf ("%u fields were pre-allocated.\n%s", PROTO_PRE_ALLOC_HF_FIELDS_MEM,
+ printf ("%d fields were pre-allocated.\n%s", PROTO_PRE_ALLOC_HF_FIELDS_MEM,
(gpa_hfinfo.allocated_len > PROTO_PRE_ALLOC_HF_FIELDS_MEM) ?
"* * Please increase PROTO_PRE_ALLOC_HF_FIELDS_MEM (in epan/proto.c)! * *\n\n" :
"\n");
printf ("The header field table consumes %u KiB of memory.\n",
- (int)(gpa_hfinfo.allocated_len * sizeof(header_field_info *) / 1024));
+ (unsigned int)(gpa_hfinfo.allocated_len * sizeof(header_field_info *) / 1024));
printf ("The fields themselves consume %u KiB of memory.\n",
- (int)(gpa_hfinfo.len * sizeof(header_field_info) / 1024));
+ (unsigned int)(gpa_hfinfo.len * sizeof(header_field_info) / 1024));
return (gpa_hfinfo.allocated_len > PROTO_PRE_ALLOC_HF_FIELDS_MEM);
}
diff --git a/extcap/extcap-base.c b/extcap/extcap-base.c
index 48b0164e76..4fcc972a1e 100644
--- a/extcap/extcap-base.c
+++ b/extcap/extcap-base.c
@@ -1,4 +1,4 @@
-/* extcap_base.c
+/* extcap-base.c
* Base function for extcaps
*
* Copyright 2015, Dario Lombardo
@@ -211,7 +211,7 @@ static gint extcap_iface_listall(extcap_parameters * extcap, uint8_t list_ifs)
return 0;
iface = (extcap_interface *) element->data;
- printf("dlt {number=%d}{name=%s}", iface->dlt, iface->dltname != NULL ? iface->dltname : iface->interface);
+ printf("dlt {number=%u}{name=%s}", iface->dlt, iface->dltname != NULL ? iface->dltname : iface->interface);
if (iface->description != NULL)
printf ("{display=%s}\n", iface->dltdescription);
else
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index 0235470883..016bcf6768 100644
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
case OPT_MAXBYTES:
maxbytes = atoi(optarg);
if (maxbytes > MAXBYTES_LIMIT) {
- errmsg_print("randpktdump: Max bytes is %u", MAXBYTES_LIMIT);
+ errmsg_print("randpktdump: Max bytes is %d", MAXBYTES_LIMIT);
goto end;
}
break;
diff --git a/rawshark.c b/rawshark.c
index 3d54ca3a63..ebfbea4f56 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -1078,7 +1078,7 @@ process_packet(capture_file *cf, epan_dissect_t *edt, gint64 offset,
passed = TRUE;
/* Print a one-line summary */
- printf(" %u", passed ? 1 : 0);
+ printf(" %d", passed ? 1 : 0);
}
printf(" -\n");
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index 50ab9b97f9..8717b19d73 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -185,15 +185,15 @@ static void follow_draw(void *contextp)
address_to_str_buf(&follow_info->client_ip, buf, sizeof buf);
if (follow_info->client_ip.type == AT_IPv6)
- printf("Node 0: [%s]:%d\n", buf, follow_info->client_port);
+ printf("Node 0: [%s]:%u\n", buf, follow_info->client_port);
else
- printf("Node 0: %s:%d\n", buf, follow_info->client_port);
+ printf("Node 0: %s:%u\n", buf, follow_info->client_port);
address_to_str_buf(&follow_info->server_ip, buf, sizeof buf);
if (follow_info->client_ip.type == AT_IPv6)
- printf("Node 1: [%s]:%d\n", buf, follow_info->server_port);
+ printf("Node 1: [%s]:%u\n", buf, follow_info->server_port);
else
- printf("Node 1: %s:%d\n", buf, follow_info->server_port);
+ printf("Node 1: %s:%u\n", buf, follow_info->server_port);
for (cur = follow_info->payload, chunk = 0;
cur != NULL;
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index ced6304817..9cae316314 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -1,4 +1,4 @@
-/* win32-file-dlg.c
+/* file_dlg_win32.c
* Native Windows file dialog routines
*
* Wireshark - Network traffic analyzer