From 94c5fd5ab06b1d8e6422e1ec1be1a71b2f684866 Mon Sep 17 00:00:00 2001 From: des Date: Sat, 13 Apr 2013 22:44:48 +0000 Subject: Clean up the ntop / pton code. Part of a patch which has been submitted upstream but not yet adopted. --- contrib/ldns/compat/b32_ntop.c | 6 +++++- contrib/ldns/compat/b32_pton.c | 7 ++++++- contrib/ldns/compat/b64_ntop.c | 5 +++++ contrib/ldns/compat/b64_pton.c | 5 ++++- contrib/ldns/ldns/config.h | 24 ------------------------ contrib/ldns/ldns/util.h | 31 +++++++++++++++++++++++++++---- 6 files changed, 47 insertions(+), 31 deletions(-) (limited to 'contrib/ldns') diff --git a/contrib/ldns/compat/b32_ntop.c b/contrib/ldns/compat/b32_ntop.c index 038ebdc..e91434b 100644 --- a/contrib/ldns/compat/b32_ntop.c +++ b/contrib/ldns/compat/b32_ntop.c @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include +#ifndef HAVE_B32_NTOP #include #include @@ -61,6 +62,8 @@ #include +#include + static const char Base32[] = "abcdefghijklmnopqrstuvwxyz234567"; /* "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";*/ @@ -171,7 +174,7 @@ static const char Pad32 = '='; */ -int +static int ldns_b32_ntop_ar(uint8_t const *src, size_t srclength, char *target, size_t targsize, const char B32_ar[]) { size_t datalength = 0; uint8_t input[5]; @@ -331,3 +334,4 @@ b32_ntop_extended_hex(uint8_t const *src, size_t srclength, char *target, size_t return ldns_b32_ntop_ar(src, srclength, target, targsize, Base32_extended_hex); } +#endif /* !HAVE_B32_NTOP */ diff --git a/contrib/ldns/compat/b32_pton.c b/contrib/ldns/compat/b32_pton.c index 9c261e6..28accb8 100644 --- a/contrib/ldns/compat/b32_pton.c +++ b/contrib/ldns/compat/b32_pton.c @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include +#ifndef HAVE_B32_PTON #include #include @@ -59,6 +60,8 @@ #include #include +#include + /* "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";*/ static const char Base32[] = "abcdefghijklmnopqrstuvwxyz234567"; @@ -174,7 +177,7 @@ static const char Pad32 = '='; it returns the number of data bytes stored at the target, or -1 on error. */ -int +static int ldns_b32_pton_ar(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize, const char B32_ar[]) { int tarindex, state, ch; @@ -385,3 +388,5 @@ b32_pton_extended_hex(char const *src, size_t hashed_owner_str_len, uint8_t *tar { return ldns_b32_pton_ar(src, hashed_owner_str_len, target, targsize, Base32_extended_hex); } + +#endif /* !HAVE_B32_PTON */ diff --git a/contrib/ldns/compat/b64_ntop.c b/contrib/ldns/compat/b64_ntop.c index d0b52b5..a40bad6 100644 --- a/contrib/ldns/compat/b64_ntop.c +++ b/contrib/ldns/compat/b64_ntop.c @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include +#ifndef HAVE_B64_NTOP #include #include @@ -59,6 +60,8 @@ #include #include +#include + #define Assert(Cond) if (!(Cond)) abort() static const char Base64[] = @@ -200,3 +203,5 @@ ldns_b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsiz target[datalength] = '\0'; /* Returned value doesn't count \0. */ return (int) (datalength); } + +#endif /* !HAVE_B64_NTOP */ diff --git a/contrib/ldns/compat/b64_pton.c b/contrib/ldns/compat/b64_pton.c index aa637d2..5b128e9 100644 --- a/contrib/ldns/compat/b64_pton.c +++ b/contrib/ldns/compat/b64_pton.c @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include +#ifndef HAVE_B64_PTON #include #include @@ -59,7 +60,7 @@ #include #include -#define Assert(Cond) if (!(Cond)) abort() +#include static const char Base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; @@ -258,3 +259,5 @@ ldns_b64_pton(char const *src, uint8_t *target, size_t targsize) return (tarindex); } + +#endif /* !HAVE_B64_PTON */ diff --git a/contrib/ldns/ldns/config.h b/contrib/ldns/ldns/config.h index 6e36ffe..aef1ee6 100644 --- a/contrib/ldns/ldns/config.h +++ b/contrib/ldns/ldns/config.h @@ -489,30 +489,6 @@ extern "C" { #endif -#ifndef B64_PTON -int ldns_b64_ntop(uint8_t const *src, size_t srclength, - char *target, size_t targsize); -/** - * calculates the size needed to store the result of b64_ntop - */ -/*@unused@*/ -static inline size_t ldns_b64_ntop_calculate_size(size_t srcsize) -{ - return ((((srcsize + 2) / 3) * 4) + 1); -} -#endif /* !B64_PTON */ -#ifndef B64_NTOP -int ldns_b64_pton(char const *src, uint8_t *target, size_t targsize); -/** - * calculates the size needed to store the result of ldns_b64_pton - */ -/*@unused@*/ -static inline size_t ldns_b64_pton_calculate_size(size_t srcsize) -{ - return (((((srcsize + 3) / 4) * 3)) + 1); -} -#endif /* !B64_NTOP */ - #ifndef HAVE_SLEEP /* use windows sleep, in millisecs, instead */ #define sleep(x) Sleep((x)*1000) diff --git a/contrib/ldns/ldns/util.h b/contrib/ldns/ldns/util.h index a6441d0..bb639b6 100644 --- a/contrib/ldns/ldns/util.h +++ b/contrib/ldns/ldns/util.h @@ -325,7 +325,7 @@ uint16_t ldns_get_random(void); */ char *ldns_bubblebabble(uint8_t *data, size_t len); -#ifndef B32_NTOP +#ifndef HAVE_B32_NTOP int ldns_b32_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize); int b32_ntop(uint8_t const *src, size_t srclength, @@ -343,8 +343,8 @@ INLINE size_t ldns_b32_ntop_calculate_size(size_t srcsize) size_t result = ((((srcsize / 5) * 8) - 2) + 2); return result; } -#endif /* !B32_NTOP */ -#ifndef B32_PTON +#endif /* !HAVE_B32_NTOP */ +#ifndef HAVE_B32_PTON int ldns_b32_pton(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize); int b32_pton(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize); int ldns_b32_pton_extended_hex(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize); @@ -358,7 +358,30 @@ INLINE size_t ldns_b32_pton_calculate_size(size_t srcsize) size_t result = ((((srcsize) / 8) * 5)); return result; } -#endif /* !B32_PTON */ +#endif /* !HAVE_B32_PTON */ +#ifndef HAVE_B64_NTOP +int ldns_b64_ntop(uint8_t const *src, size_t srclength, + char *target, size_t targsize); +/** + * calculates the size needed to store the result of b64_ntop + */ +/*@unused@*/ +static inline size_t ldns_b64_ntop_calculate_size(size_t srcsize) +{ + return ((((srcsize + 2) / 3) * 4) + 1); +} +#endif /* !HAVE_B64_NTOP */ +#ifndef HAVE_B64_PTON +int ldns_b64_pton(char const *src, uint8_t *target, size_t targsize); +/** + * calculates the size needed to store the result of ldns_b64_pton + */ +/*@unused@*/ +static inline size_t ldns_b64_pton_calculate_size(size_t srcsize) +{ + return (((((srcsize + 3) / 4) * 3)) + 1); +} +#endif /* !HAVE_B64_PTON */ INLINE time_t ldns_time(time_t *t) { return time(t); } -- cgit v1.1