summaryrefslogtreecommitdiff
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2009-03-07 05:11:15 +0000
committerGuy Harris <guy@alum.mit.edu>2009-03-07 05:11:15 +0000
commitb2408ca1a3ff7b70da16ffb1f0847cf8ba9f5577 (patch)
tree5cc20421f1f5ca542dcfb75eba05060532e11674 /wiretap
parente6ccfc6944495314302a64ce92375130ea64dc10 (diff)
downloadwireshark-b2408ca1a3ff7b70da16ffb1f0847cf8ba9f5577.tar.gz
Squelch warnings - none of those strings will be so long that the
difference between an int and a gsize/size_t matters. svn path=/trunk/; revision=27637
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/catapult_dct2000.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index 2e077fd76c..3fcd546cb3 100644
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -802,7 +802,7 @@ gboolean read_new_line(FILE_T fh, gint64 *offset, gint *length)
}
/* Set length and offset.. */
- *length = strlen(linebuff);
+ *length = (gint)strlen(linebuff);
*offset = *offset + *length;
/* ...but don't want to include newline in line length */
@@ -1245,7 +1245,7 @@ int write_stub_header(guchar *frame_buffer, char *timestamp_string,
int stub_offset = 0;
g_strlcpy((char*)frame_buffer, context_name, MAX_CONTEXT_NAME+1);
- stub_offset += (strlen(context_name) + 1);
+ stub_offset += (int)(strlen(context_name) + 1);
/* Context port number */
frame_buffer[stub_offset] = context_port;
@@ -1253,19 +1253,19 @@ int write_stub_header(guchar *frame_buffer, char *timestamp_string,
/* Timestamp within file */
g_strlcpy((char*)&frame_buffer[stub_offset], timestamp_string, MAX_TIMESTAMP_LEN+1);
- stub_offset += (strlen(timestamp_string) + 1);
+ stub_offset += (int)(strlen(timestamp_string) + 1);
/* Protocol name */
g_strlcpy((char*)&frame_buffer[stub_offset], protocol_name, MAX_PROTOCOL_NAME+1);
- stub_offset += (strlen(protocol_name) + 1);
+ stub_offset += (int)(strlen(protocol_name) + 1);
/* Protocol variant number (as string) */
g_strlcpy((void*)&frame_buffer[stub_offset], variant_name, MAX_VARIANT_DIGITS+1);
- stub_offset += (strlen(variant_name) + 1);
+ stub_offset += (int)(strlen(variant_name) + 1);
/* Outhdr */
g_strlcpy((char*)&frame_buffer[stub_offset], outhdr_name, MAX_OUTHDR_NAME+1);
- stub_offset += (strlen(outhdr_name) + 1);
+ stub_offset += (int)(strlen(outhdr_name) + 1);
/* Direction */
frame_buffer[stub_offset] = direction;