diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-06-21 02:59:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-06-21 02:59:54 +0000 |
| commit | f13ba97806b461502beedced7b4186057c1db545 (patch) | |
| tree | da458e344984baad6acea6eaee7d975c32155657 /wiretap | |
| parent | d90ad5316bc5fc3e63ce509488b76e2d60a5457a (diff) | |
| download | wireshark-f13ba97806b461502beedced7b4186057c1db545.tar.gz | |
Fix some pointer-signedness (well, signedness of what the pointer points
to) warnings.
svn path=/trunk/; revision=50104
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/catapult_dct2000.c | 2 | ||||
| -rw-r--r-- | wiretap/dct3trace.c | 10 | ||||
| -rw-r--r-- | wiretap/pcapng.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c index f39da81c6d..769fb7e2e6 100644 --- a/wiretap/catapult_dct2000.c +++ b/wiretap/catapult_dct2000.c @@ -715,7 +715,7 @@ catapult_dct2000_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, /* Protocol name */ if (is_comment) { - is_sprint = strcmp(pd+n, "sprint") == 0; + is_sprint = strcmp((char *)pd+n, "sprint") == 0; } for (; pd[n] != '\0'; n++); n++; diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 284af2e06a..230c86b8ba 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -95,7 +95,7 @@ hc2b(unsigned char hex) } static int -hex2bin(guint8 *out, guint8 *out_end, unsigned char *in) +hex2bin(guint8 *out, guint8 *out_end, char *in) { guint8 *out_start = out; int is_low = 0; @@ -103,7 +103,7 @@ hex2bin(guint8 *out, guint8 *out_end, unsigned char *in) while (*in != '\0') { - c = hc2b(*in); + c = hc2b(*(unsigned char *)in); if (c < 0) { in++; @@ -130,13 +130,13 @@ hex2bin(guint8 *out, guint8 *out_end, unsigned char *in) } static int -xml_get_int(int *val, const unsigned char *str, const unsigned char *pattern) +xml_get_int(int *val, const char *str, const char *pattern) { const char *ptr; char *start, *end; char buf[32]; - ptr = strstr((const char *)str, (const char *)pattern); + ptr = strstr(str, pattern); if (ptr == NULL) return -1; start = strchr(ptr, '"'); @@ -191,7 +191,7 @@ int dct3trace_open(wtap *wth, int *err, gchar **err_info) static gboolean dct3trace_get_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) { - unsigned char line[1024]; + char line[1024]; guint8 databuf[MAX_PACKET_LEN], *bufp; gboolean have_data = FALSE; int len = 0; diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 6ad0d21ce0..80cf0d73d7 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -1458,7 +1458,7 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t * * *err_info appropriately. */ static int -name_resolution_block_find_name_end(guint8 *p, guint record_len, int *err, +name_resolution_block_find_name_end(const char *p, guint record_len, int *err, gchar **err_info) { int namelen; @@ -1496,7 +1496,7 @@ pcapng_read_name_resolution_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t Buffer nrb_rec; guint32 v4_addr; guint record_len; - guint8 *namep; + char *namep; int namelen; /* @@ -1619,7 +1619,7 @@ pcapng_read_name_resolution_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t buffer_start_ptr(&nrb_rec), 4); if (pn->byte_swapped) v4_addr = BSWAP32(v4_addr); - for (namep = buffer_start_ptr(&nrb_rec) + 4, record_len = nrb.record_len - 4; + for (namep = (char *)buffer_start_ptr(&nrb_rec) + 4, record_len = nrb.record_len - 4; record_len != 0; namep += namelen, record_len -= namelen) { /* @@ -1683,7 +1683,7 @@ pcapng_read_name_resolution_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t block_read += bytes_read; if (pn->add_new_ipv6) { - for (namep = buffer_start_ptr(&nrb_rec) + 16, record_len = nrb.record_len - 16; + for (namep = (char *)buffer_start_ptr(&nrb_rec) + 16, record_len = nrb.record_len - 16; record_len != 0; namep += namelen, record_len -= namelen) { /* |