diff options
| author | obiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-10 22:20:24 +0000 |
|---|---|---|
| committer | obiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-10 22:20:24 +0000 |
| commit | f409cbb40adc066e7c5cfd120d3a1b0d5fddd146 (patch) | |
| tree | b12ff9e329557a4fd86946f39cdc931312d3bb5a /util.c | |
| parent | db077cc7fb3afd0600e830d1da259997f9fe24ae (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().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10840 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |