aboutsummaryrefslogtreecommitdiffstats
path: root/util.c
diff options
context:
space:
mode:
authorOlivier Biot <obiot.ethereal@gmail.com>2004-05-10 22:20:24 +0000
committerOlivier Biot <obiot.ethereal@gmail.com>2004-05-10 22:20:24 +0000
commit4ee7c7faf6eaf275e6b4789acbc3c6c2585f26d5 (patch)
treeb12ff9e329557a4fd86946f39cdc931312d3bb5a /util.c
parent687f3af0f21a62d4b687549c5f6546bac6b02747 (diff)
As noted by Thomas Anders, the Heimdal libroken library has a base64_decode()
function with a different signature than the one defined in util.c/util.h. For this reason, we need to rename our base64_decode() routine. The routine is now called epan_base64_decode(). svn path=/trunk/; revision=10840
Diffstat (limited to 'util.c')
-rw-r--r--util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/util.c b/util.c
index 45b15df886..452111e7c9 100644
--- a/util.c
+++ b/util.c
@@ -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;