diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-25 16:58:25 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-25 16:58:25 +0000 |
| commit | bd30b27f2d8708d4734609af121c1a9fa984771a (patch) | |
| tree | e66e8f6da245f5eea007b5de2dfafa014f42caf2 /epan | |
| parent | b3988f752c7128d5693130e79df863237e36f849 (diff) | |
Change the first arg to hex_str_to_bytes from guchar* -> char*
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9842 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/strutil.c | 4 | ||||
| -rw-r--r-- | epan/strutil.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/strutil.c b/epan/strutil.c index c3386994ab..b275d76612 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -1,7 +1,7 @@ /* strutil.c * String utility routines * - * $Id: strutil.c,v 1.15 2003/12/29 19:53:52 guy Exp $ + * $Id: strutil.c,v 1.16 2004/01/25 16:58:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -312,7 +312,7 @@ is_byte_sep(guint8 c) * is_byte_sep() into a byte array. */ gboolean -hex_str_to_bytes(const guchar *hex_str, GByteArray *bytes) { +hex_str_to_bytes(const char *hex_str, GByteArray *bytes) { guint8 val; guchar *p, *q, *punct; char two_digits[3]; diff --git a/epan/strutil.h b/epan/strutil.h index 95d1c2e7e4..a90c294646 100644 --- a/epan/strutil.h +++ b/epan/strutil.h @@ -1,7 +1,7 @@ /* strutil.h * String utility definitions * - * $Id: strutil.h,v 1.13 2003/12/29 19:53:52 guy Exp $ + * $Id: strutil.h,v 1.14 2004/01/25 16:58:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -34,7 +34,7 @@ int get_token_len(const guchar *linep, const guchar *lineend, gchar* format_text(const guchar *line, int len); gchar* bytes_to_str(const guint8 *, int); gchar* bytes_to_str_punct(const guint8 *, int, gchar punct); -gboolean hex_str_to_bytes(const guchar *hex_str, GByteArray *bytes); +gboolean hex_str_to_bytes(const char *hex_str, GByteArray *bytes); const guint8 * epan_memmem(const guint8 *haystack, guint haystack_len, const guint8 *needle, guint needle_len); |