diff options
| author | Doug MacEachern <dougm@apache.org> | 2001-02-08 08:45:33 +0100 |
|---|---|---|
| committer | Doug MacEachern <dougm@apache.org> | 2001-02-08 08:45:33 +0100 |
| commit | 88d3406f9a35c503b9f0e3f125aacdaa05df9371 (patch) | |
| tree | 39470637773d75d2fc514c333a1af2554f92775c /server/util_md5.c | |
| parent | scoreboard.h says it is extern (and scoreboard.c instantiates it), (diff) | |
| download | apache2-88d3406f9a35c503b9f0e3f125aacdaa05df9371.tar.xz apache2-88d3406f9a35c503b9f0e3f125aacdaa05df9371.zip | |
renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/util_md5.c')
| -rw-r--r-- | server/util_md5.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/server/util_md5.c b/server/util_md5.c index c6b130cd18..631f7b579c 100644 --- a/server/util_md5.c +++ b/server/util_md5.c @@ -104,12 +104,12 @@ AP_DECLARE(char *) ap_md5_binary(apr_pool_t *p, const unsigned char *buf, int le * Take the MD5 hash of the string argument. */ - apr_MD5Init(&my_md5); + apr_md5_init(&my_md5); #if APR_CHARSET_EBCDIC - apr_MD5SetXlate(&my_md5, ap_hdrs_to_ascii); + apr_md5_set_xlate(&my_md5, ap_hdrs_to_ascii); #endif - apr_MD5Update(&my_md5, buf, (unsigned int)length); - apr_MD5Final(hash, &my_md5); + apr_md5_update(&my_md5, buf, (unsigned int)length); + apr_md5_final(hash, &my_md5); for (i = 0, r = result; i < MD5_DIGESTSIZE; i++) { *r++ = hex[hash[i] >> 4]; @@ -179,7 +179,7 @@ AP_DECLARE(char *) ap_md5contextTo64(apr_pool_t *a, apr_md5_ctx_t *context) encodedDigest = (char *) apr_pcalloc(a, 25 * sizeof(char)); - apr_MD5Final(digest, context); + apr_md5_final(digest, context); digest[sizeof(digest) - 1] = digest[sizeof(digest) - 2] = 0; p = encodedDigest; @@ -203,13 +203,13 @@ AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile) apr_size_t nbytes; apr_off_t offset = 0L; - apr_MD5Init(&context); + apr_md5_init(&context); nbytes = sizeof(buf); - while (apr_read(infile, buf, &nbytes) == APR_SUCCESS) { + while (apr_file_read(infile, buf, &nbytes) == APR_SUCCESS) { length += nbytes; - apr_MD5Update(&context, buf, nbytes); + apr_md5_update(&context, buf, nbytes); } - apr_seek(infile, APR_SET, &offset); + apr_file_seek(infile, APR_SET, &offset); return ap_md5contextTo64(p, &context); } |