osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More 64-bit fixes. 

svn path=/trunk/; revision=27685
This commit is contained in:
Gerald Combs 2009-03-09 22:37:55 +00:00
parent 40f5a17d46
commit 2236109a82
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wiretap/ngsniffer.c
View File

@ -2497,7 +2497,7 @@ ng_file_read(void *buffer, size_t elementsize, size_t numelements, wtap *wth,
copybytes -= bytes_to_copy;
copied_bytes += bytes_to_copy;
outbuffer += bytes_to_copy;
comp_stream->nextout += bytes_to_copy;
comp_stream->nextout += (int) bytes_to_copy;
comp_stream->uncomp_offset += bytes_to_copy;
}
return copied_bytes;

2
wiretap/toshiba.c
View File

@ -177,7 +177,7 @@ static gboolean toshiba_check_file_type(wtap *wth, int *err)
for (line = 0; line < TOSHIBA_HEADER_LINES_TO_CHECK; line++) {
if (file_gets(buf, TOSHIBA_LINE_LENGTH, wth->fh) != NULL) {
reclen = strlen(buf);
reclen = (guint) strlen(buf);
if (reclen < TOSHIBA_HDR_MAGIC_SIZE) {
continue;
}

2
wiretap/visual.c
View File

@ -819,7 +819,7 @@ static gboolean visual_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* Update the table index and offset for the next frame. */
visual->index_table_index++;
visual->next_offset += hdr_size + phdr->caplen;
visual->next_offset += (guint32) hdr_size + phdr->caplen;
return TRUE;
}

4
wiretap/vms.c
View File

@ -222,7 +222,7 @@ static gboolean vms_check_file_type(wtap *wth, int *err)
}
if (file_gets(buf, VMS_LINE_LENGTH, wth->fh) != NULL) {
reclen = strlen(buf);
reclen = (guint) strlen(buf);
if (reclen < strlen(VMS_HDR_MAGIC_STR1) ||
reclen < strlen(VMS_HDR_MAGIC_STR2) ||
reclen < strlen(VMS_HDR_MAGIC_STR3)) {
@ -435,7 +435,7 @@ parse_vms_rec_hdr(wtap *wth, FILE_T fh, int *err, gchar **err_info)
if (wth) {
p = strstr(months, mon);
if (p)
tm.tm_mon = (p - months) / 3;
tm.tm_mon = (int) (p - months) / 3;
tm.tm_year -= 1900;
tm.tm_isdst = -1;