diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2007-09-07 14:08:19 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2007-09-07 14:08:19 -0600 |
| commit | 93744e253a50cdd78097dc5a150f4c035e8cbcc9 (patch) | |
| tree | f7470097a04345f967281dd4d658dd065c51d166 /lib/isc/base64.c | |
| parent | 6257efc35455318993208bef65a551ac6039f51f (diff) | |
| download | bind9-93744e253a50cdd78097dc5a150f4c035e8cbcc9.tar.gz | |
9.0.0b3
Diffstat (limited to 'lib/isc/base64.c')
| -rw-r--r-- | lib/isc/base64.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/lib/isc/base64.c b/lib/isc/base64.c index 3661c84c..0afa4f34 100644 --- a/lib/isc/base64.c +++ b/lib/isc/base64.c @@ -15,30 +15,25 @@ * SOFTWARE. */ -/* $Id: base64.c,v 1.8 2000/03/17 17:45:50 gson Exp $ */ +/* $Id: base64.c,v 1.13 2000/05/16 05:19:46 tale Exp $ */ #include <config.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <time.h> - #include <isc/base64.h> #include <isc/buffer.h> #include <isc/lex.h> -#include <isc/assertions.h> -#include <isc/error.h> -#include <isc/region.h> +#include <isc/string.h> +#include <isc/util.h> #define RETERR(x) do { \ - isc_result_t __r = (x); \ - if (__r != ISC_R_SUCCESS) \ - return (__r); \ + isc_result_t _r = (x); \ + if (_r != ISC_R_SUCCESS) \ + return (_r); \ } while (0) -/* These static functions are also present in lib/dns/rdata.c. I'm not +/* + * These static functions are also present in lib/dns/rdata.c. I'm not * sure where they should go. -- bwelling */ static isc_result_t str_totext(char *source, isc_buffer_t *target); @@ -166,7 +161,7 @@ str_totext(char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; - isc_buffer_available(target, ®ion); + isc_buffer_availableregion(target, ®ion); l = strlen(source); if (l > region.length) @@ -181,7 +176,7 @@ static isc_result_t mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_region_t tr; - isc_buffer_available(target, &tr); + isc_buffer_availableregion(target, &tr); if (length > tr.length) return (ISC_R_NOSPACE); memcpy(tr.base, base, length); |