diff options
| -rw-r--r-- | packet-http.c | 6 | ||||
| -rw-r--r-- | util.c | 4 | ||||
| -rw-r--r-- | util.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/packet-http.c b/packet-http.c index 3d58624738..2756085b1f 100644 --- a/packet-http.c +++ b/packet-http.c @@ -7,7 +7,7 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 1999, Andrew Tridgell <tridge@samba.org> * - * $Id: packet-http.c,v 1.108 2004/05/09 09:07:33 obiot Exp $ + * $Id: packet-http.c,v 1.109 2004/05/10 22:20:24 obiot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -173,7 +173,7 @@ base64_to_tvb(const char *base64) char *data = g_strdup(base64); size_t len; - len = base64_decode(data); + len = epan_base64_decode(data); tvb = tvb_new_real_data((const guint8 *)data, len, len); tvb_set_free_cb(tvb, g_free); @@ -1479,7 +1479,7 @@ check_auth_basic(proto_item *hdr_item, tvbuff_t *tvb, gchar *value) hdr_tree = NULL; value += hdrlen; - len = base64_decode(value); + len = epan_base64_decode(value); value[len] = '\0'; proto_tree_add_string(hdr_tree, hf_http_basic, tvb, 0, 0, value); @@ -1,7 +1,7 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.78 2004/03/12 17:23:56 gerald Exp $ + * $Id: util.c,v 1.79 2004/05/10 22:20:24 obiot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -369,7 +369,7 @@ compute_timestamp_diff(gint *diffsec, gint *diffusec, Return length of result. Taken from rproxy/librsync/base64.c by Andrew Tridgell. */ -size_t base64_decode(char *s) +size_t epan_base64_decode(char *s) { static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; int bit_offset, byte_offset, idx, i, n; @@ -1,7 +1,7 @@ /* util.h * Utility definitions * - * $Id: util.h,v 1.31 2004/01/11 22:17:43 guy Exp $ + * $Id: util.h,v 1.32 2004/05/10 22:20:24 obiot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -45,7 +45,7 @@ guint8 EBCDIC_to_ASCII1(guint8 c); /* Compute the difference between two seconds/microseconds time stamps. */ void compute_timestamp_diff(gint *, gint *, guint32, guint32, guint32, guint32); /* In-place decoding of a base64 string. */ -size_t base64_decode(char *s); +size_t epan_base64_decode(char *s); /* Create a capture filter for the connection */ char *get_conn_cfilter(void); |