diff options
| -rw-r--r-- | epan/dissectors/packet-dnp.c | 2 | ||||
| -rw-r--r-- | epan/strutil.c | 4 | ||||
| -rw-r--r-- | epan/strutil.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index b832c12659..5cf0202b53 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -2506,7 +2506,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* if all crc OK, set up new tvb */ if (crc_OK) { - al_tvb = tvb_new_real_data(tmp, tmp_ptr-tmp, tmp_ptr-tmp); + al_tvb = tvb_new_real_data(tmp, (guint) (tmp_ptr-tmp), (gint) (tmp_ptr-tmp)); tvb_set_child_real_data_tvbuff(tvb, al_tvb); /* Check for fragmented packet */ diff --git a/epan/strutil.c b/epan/strutil.c index 724d595314..351a792946 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -162,7 +162,7 @@ get_token_len(const guchar *linep, const guchar *lineend, * characters as C-style escapes, and return a pointer to it. */ gchar * -format_text(const guchar *string, int len) +format_text(const guchar *string, size_t len) { static gchar *fmtbuf[3]; static int fmtbuf_len[3]; @@ -268,7 +268,7 @@ format_text(const guchar *string, int len) * which will be replaced by a space, and return a pointer to it. */ gchar * -format_text_wsp(const guchar *string, int len) +format_text_wsp(const guchar *string, size_t len) { static gchar *fmtbuf[3]; static int fmtbuf_len[3]; diff --git a/epan/strutil.h b/epan/strutil.h index 3499afc59f..4ee9b22025 100644 --- a/epan/strutil.h +++ b/epan/strutil.h @@ -62,9 +62,9 @@ int get_token_len(const guchar *linep, const guchar *lineend, * * @see tvb_format_text() */ -gchar* format_text(const guchar *line, int len); +gchar* format_text(const guchar *line, size_t len); -gchar* format_text_wsp(const guchar *line, int len); +gchar* format_text_wsp(const guchar *line, size_t len); /** Turn an array of bytes into a string showing the bytes in hex. * |