1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>'

Browse Source 
Applying part of Bug 7825

Change-Id: I460b5c61b04d793ccc27c25debbd5e8f08bc6974
Reviewed-on: https://code.wireshark.org/review/2280
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2014-06-17 00:00:23 +02:00 committed by Anders Broman
parent 319ad97717
commit f5476e90a0
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wiretap/5views.c
View File

@ -333,7 +333,7 @@ int _5views_dump_can_write_encap(int encap)
if (encap == WTAP_ENCAP_PER_PACKET)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap < 0 || (unsigned) encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
if (encap < 0 || (unsigned int) encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
return WTAP_ERR_UNSUPPORTED_ENCAP;
return 0;

2
wiretap/file_access.c
View File

@ -2331,7 +2331,7 @@ gboolean wtap_dump_file_write(wtap_dumper *wdh, const void *buf, size_t bufsize,
#ifdef HAVE_LIBZ
if (wdh->compressed) {
nwritten = gzwfile_write((GZWFILE_T)wdh->fh, buf, (unsigned) bufsize);
nwritten = gzwfile_write((GZWFILE_T)wdh->fh, buf, (unsigned int) bufsize);
/*
* gzwfile_write() returns 0 on error.
*/

6
wiretap/i4btrace.c
View File

@ -44,9 +44,9 @@ static int i4b_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
* Test some fields in the header to see if they make sense.
*/
#define I4B_HDR_IS_OK(hdr) \
(!((unsigned)hdr.length < 3 || (unsigned)hdr.length > 16384 || \
(unsigned)hdr.unit > 4 || (unsigned)hdr.type > 4 || \
(unsigned)hdr.dir > 2 || (unsigned)hdr.trunc > 2048))
(!((unsigned int)hdr.length < 3 || (unsigned int)hdr.length > 16384 || \
(unsigned int)hdr.unit > 4 || (unsigned int)hdr.type > 4 || \
(unsigned int)hdr.dir > 2 || (unsigned int)hdr.trunc > 2048))
int i4btrace_open(wtap *wth, int *err, gchar **err_info)
{

2
wiretap/iseries.c
View File

@ -224,7 +224,7 @@ iseries_open (wtap * wth, int *err, gchar ** err_info)
* Check if this is a UNICODE formatted file by scanning for the magic string
*/
offset=0;
while ((unsigned)offset < (ISERIES_LINE_LENGTH - (sizeof unicodemagic)))
while ((unsigned int)offset < (ISERIES_LINE_LENGTH - (sizeof unicodemagic)))
{
if (memcmp (magic + offset, unicodemagic, sizeof unicodemagic) == 0) {
if (file_seek (wth->fh, 0, SEEK_SET, err) == -1)

2
wsutil/md5.c
View File

@ -59,7 +59,7 @@
/*
* Note: this code is harmless on little-endian machines.
*/
static void byteReverse(guint32 *buf, unsigned longs)
static void byteReverse(guint32 *buf, unsigned int longs)
{
guint32 t;
do {