diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-08-07 19:25:59 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-08-07 19:25:59 +0000 |
| commit | 4e21519ca956e00cec1ccc9201ccf4c6ec9f6405 (patch) | |
| tree | 36b54fe822f5eb35485f91268555a25f64cad7d8 /encoding | |
| parent | 768571a9eebaea9356f420f28349ee03fcb9e814 (diff) | |
| download | libapr-util-4e21519ca956e00cec1ccc9201ccf4c6ec9f6405.tar.gz | |
Fix some problems with the apr conversion so that APACHE_XLATE builds work
again.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@57824 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'encoding')
| -rw-r--r-- | encoding/ap_base64.c | 12 | ||||
| -rw-r--r-- | encoding/apr_base64.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/encoding/ap_base64.c b/encoding/ap_base64.c index af1e9305..39d8c516 100644 --- a/encoding/ap_base64.c +++ b/encoding/ap_base64.c @@ -124,14 +124,14 @@ API_EXPORT(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii, /* Only single-byte conversion is supported. */ - rv = ap_xlate_get_sb(to_ascii, &onoff); + rv = apr_xlate_get_sb(to_ascii, &onoff); if (rv) { return rv; } if (!onoff) { /* If conversion is not single-byte-only */ return APR_EINVAL; } - rv = ap_xlate_get_sb(to_ebcdic, &onoff); + rv = apr_xlate_get_sb(to_ebcdic, &onoff); if (rv) { return rv; } @@ -143,8 +143,8 @@ API_EXPORT(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii, os_toascii[i] = i; } inbytes_left = outbytes_left = sizeof(os_toascii); - ap_xlate_conv_buffer(to_ascii, os_toascii, &inbytes_left, - os_toascii, &outbytes_left); + apr_xlate_conv_buffer(to_ascii, os_toascii, &inbytes_left, + os_toascii, &outbytes_left); return APR_SUCCESS; } @@ -175,8 +175,8 @@ API_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded) len = ap_base64decode_binary((unsigned char *) bufplain, bufcoded); #ifdef CHARSET_EBCDIC inbytes_left = outbytes_left = len; - ap_xlate_conv_buffer(xlate_to_ebcdic, bufplain, &inbytes_left, - bufplain, &outbytes_left); + apr_xlate_conv_buffer(xlate_to_ebcdic, bufplain, &inbytes_left, + bufplain, &outbytes_left); #endif /* CHARSET_EBCDIC */ bufplain[len] = '\0'; return len; diff --git a/encoding/apr_base64.c b/encoding/apr_base64.c index af1e9305..39d8c516 100644 --- a/encoding/apr_base64.c +++ b/encoding/apr_base64.c @@ -124,14 +124,14 @@ API_EXPORT(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii, /* Only single-byte conversion is supported. */ - rv = ap_xlate_get_sb(to_ascii, &onoff); + rv = apr_xlate_get_sb(to_ascii, &onoff); if (rv) { return rv; } if (!onoff) { /* If conversion is not single-byte-only */ return APR_EINVAL; } - rv = ap_xlate_get_sb(to_ebcdic, &onoff); + rv = apr_xlate_get_sb(to_ebcdic, &onoff); if (rv) { return rv; } @@ -143,8 +143,8 @@ API_EXPORT(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii, os_toascii[i] = i; } inbytes_left = outbytes_left = sizeof(os_toascii); - ap_xlate_conv_buffer(to_ascii, os_toascii, &inbytes_left, - os_toascii, &outbytes_left); + apr_xlate_conv_buffer(to_ascii, os_toascii, &inbytes_left, + os_toascii, &outbytes_left); return APR_SUCCESS; } @@ -175,8 +175,8 @@ API_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded) len = ap_base64decode_binary((unsigned char *) bufplain, bufcoded); #ifdef CHARSET_EBCDIC inbytes_left = outbytes_left = len; - ap_xlate_conv_buffer(xlate_to_ebcdic, bufplain, &inbytes_left, - bufplain, &outbytes_left); + apr_xlate_conv_buffer(xlate_to_ebcdic, bufplain, &inbytes_left, + bufplain, &outbytes_left); #endif /* CHARSET_EBCDIC */ bufplain[len] = '\0'; return len; |