diff options
| author | Doug MacEachern <dougm@apache.org> | 2000-08-02 05:27:38 +0000 |
|---|---|---|
| committer | Doug MacEachern <dougm@apache.org> | 2000-08-02 05:27:38 +0000 |
| commit | 059d8dd2122f0a3948c2c09549159f0931a6f236 (patch) | |
| tree | 8a2937938ed4eec31f918c6c8401ce07012cd37a /server/util_ebcdic.c | |
| parent | 3ae78ff3833de9187e9fc0eb6aab69a8b8162c5a (diff) | |
| download | httpd-059d8dd2122f0a3948c2c09549159f0931a6f236.tar.gz | |
prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/util_ebcdic.c')
| -rw-r--r-- | server/util_ebcdic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/util_ebcdic.c b/server/util_ebcdic.c index c319f97607..c642035f48 100644 --- a/server/util_ebcdic.c +++ b/server/util_ebcdic.c @@ -65,9 +65,9 @@ #include "http_core.h" #include "util_ebcdic.h" -ap_status_t ap_init_ebcdic(ap_pool_t *pool) +apr_status_t ap_init_ebcdic(apr_pool_t *pool) { - ap_status_t rv; + apr_status_t rv; char buf[80]; rv = ap_xlate_open(&ap_hdrs_to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool); @@ -125,11 +125,11 @@ ap_status_t ap_init_ebcdic(ap_pool_t *pool) #define ASCIITEXT_MAGIC_TYPE_PREFIX "text/x-ascii-" /* Text files whose content-type starts with this are passed thru unconverted */ /* Check the Content-Type to decide if conversion is needed */ -ap_xlate_t *ap_checkconv(struct request_rec *r) +apr_xlate_t *ap_checkconv(struct request_rec *r) { int convert_to_ascii; const char *type; - ap_xlate_t *zero = NULL; + apr_xlate_t *zero = NULL; /* To make serving of "raw ASCII text" files easy (they serve faster * since they don't have to be converted from EBCDIC), a new @@ -149,7 +149,7 @@ ap_xlate_t *ap_checkconv(struct request_rec *r) strncasecmp(type, "message/", 8) == 0)) { if (strncasecmp(type, ASCIITEXT_MAGIC_TYPE_PREFIX, sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1) == 0) - r->content_type = ap_pstrcat(r->pool, "text/", + r->content_type = apr_pstrcat(r->pool, "text/", type+sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1, NULL); else |