diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-05 19:25:47 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-06 02:26:11 +0000 |
| commit | 8481c438614427a9249aa20e31062e3bf7a86a89 (patch) | |
| tree | f6bb571b551d7405c06d48a2d4ab1ac9f4e472b8 /wiretap | |
| parent | ab5d1cfa20b3047ed062bc3b9fbf85d396ae7e63 (diff) | |
| download | wireshark-8481c438614427a9249aa20e31062e3bf7a86a89.tar.gz | |
Fix more errors revealed by enum-to-integer conversion warnings.
Change-Id: Ib28af874cbac0623ed94e7558f3711e9a1b03a2d
Reviewed-on: https://code.wireshark.org/review/2874
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netmon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 10a7114e8f..6dcd40a5cc 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -509,7 +509,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, if (*err == 0 && bytes_read != 0) { *err = WTAP_ERR_SHORT_READ; } - return FALSE; + return FAILURE; } switch (netmon->version_major) { @@ -532,7 +532,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("netmon: File has %u-byte packet, bigger than maximum of %u", packet_size, WTAP_MAX_PACKET_SIZE); - return FALSE; + return FAILURE; } phdr->rec_type = REC_TYPE_PACKET; @@ -555,11 +555,11 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("netmon: ATM file has a %u-byte packet, too small to have even an ATM pseudo-header", packet_size); - return FALSE; + return FAILURE; } if (!netmon_read_atm_pseudoheader(fh, &phdr->pseudo_header, err, err_info)) - return FALSE; /* Read error */ + return FAILURE; /* Read error */ /* * Don't count the pseudo-header as part of the packet. @@ -649,7 +649,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, * Read the packet data. */ if (!wtap_read_packet_bytes(fh, buf, phdr->caplen, err, err_info)) - return FALSE; + return FAILURE; /* * For version 2.1 and later, there's additional information |