parent
40f5a17d46
commit
2236109a82
|
@ -2497,7 +2497,7 @@ ng_file_read(void *buffer, size_t elementsize, size_t numelements, wtap *wth,
|
||||||
copybytes -= bytes_to_copy;
|
copybytes -= bytes_to_copy;
|
||||||
copied_bytes += bytes_to_copy;
|
copied_bytes += bytes_to_copy;
|
||||||
outbuffer += 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;
|
comp_stream->uncomp_offset += bytes_to_copy;
|
||||||
}
|
}
|
||||||
return copied_bytes;
|
return copied_bytes;
|
||||||
|
|
|
@ -177,7 +177,7 @@ static gboolean toshiba_check_file_type(wtap *wth, int *err)
|
||||||
for (line = 0; line < TOSHIBA_HEADER_LINES_TO_CHECK; line++) {
|
for (line = 0; line < TOSHIBA_HEADER_LINES_TO_CHECK; line++) {
|
||||||
if (file_gets(buf, TOSHIBA_LINE_LENGTH, wth->fh) != NULL) {
|
if (file_gets(buf, TOSHIBA_LINE_LENGTH, wth->fh) != NULL) {
|
||||||
|
|
||||||
reclen = strlen(buf);
|
reclen = (guint) strlen(buf);
|
||||||
if (reclen < TOSHIBA_HDR_MAGIC_SIZE) {
|
if (reclen < TOSHIBA_HDR_MAGIC_SIZE) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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. */
|
/* Update the table index and offset for the next frame. */
|
||||||
visual->index_table_index++;
|
visual->index_table_index++;
|
||||||
visual->next_offset += hdr_size + phdr->caplen;
|
visual->next_offset += (guint32) hdr_size + phdr->caplen;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -222,7 +222,7 @@ static gboolean vms_check_file_type(wtap *wth, int *err)
|
||||||
}
|
}
|
||||||
if (file_gets(buf, VMS_LINE_LENGTH, wth->fh) != NULL) {
|
if (file_gets(buf, VMS_LINE_LENGTH, wth->fh) != NULL) {
|
||||||
|
|
||||||
reclen = strlen(buf);
|
reclen = (guint) strlen(buf);
|
||||||
if (reclen < strlen(VMS_HDR_MAGIC_STR1) ||
|
if (reclen < strlen(VMS_HDR_MAGIC_STR1) ||
|
||||||
reclen < strlen(VMS_HDR_MAGIC_STR2) ||
|
reclen < strlen(VMS_HDR_MAGIC_STR2) ||
|
||||||
reclen < strlen(VMS_HDR_MAGIC_STR3)) {
|
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) {
|
if (wth) {
|
||||||
p = strstr(months, mon);
|
p = strstr(months, mon);
|
||||||
if (p)
|
if (p)
|
||||||
tm.tm_mon = (p - months) / 3;
|
tm.tm_mon = (int) (p - months) / 3;
|
||||||
tm.tm_year -= 1900;
|
tm.tm_year -= 1900;
|
||||||
|
|
||||||
tm.tm_isdst = -1;
|
tm.tm_isdst = -1;
|
||||||
|
|
Loading…
Reference in New Issue