diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-10-10 13:12:37 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-10-10 13:12:37 +0000 |
| commit | 6790b9bd545fe84900c116cbf90902deb44d9a33 (patch) | |
| tree | 91c68564aaa2dddd1db8e3e2c291e987a16f6013 /pjlib-util | |
| parent | c1d85c851c8e9892a46d48381bab249492bdf423 (diff) | |
Fixed build warnings/error on Linux
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1490 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib-util')
| -rw-r--r-- | pjlib-util/include/pjlib-util.h | 1 | ||||
| -rw-r--r-- | pjlib-util/include/pjlib-util/base64.h | 2 | ||||
| -rw-r--r-- | pjlib-util/src/pjlib-util-test/encryption.c | 4 | ||||
| -rw-r--r-- | pjlib-util/src/pjlib-util/base64.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/pjlib-util/include/pjlib-util.h b/pjlib-util/include/pjlib-util.h index c12e0b28..fcafcf1e 100644 --- a/pjlib-util/include/pjlib-util.h +++ b/pjlib-util/include/pjlib-util.h @@ -32,6 +32,7 @@ #include <pjlib-util/getopt.h> /* Crypto */ +#include <pjlib-util/base64.h> #include <pjlib-util/crc32.h> #include <pjlib-util/hmac_md5.h> #include <pjlib-util/hmac_sha1.h> diff --git a/pjlib-util/include/pjlib-util/base64.h b/pjlib-util/include/pjlib-util/base64.h index b01f918b..f7a20a6c 100644 --- a/pjlib-util/include/pjlib-util/base64.h +++ b/pjlib-util/include/pjlib-util/base64.h @@ -76,7 +76,7 @@ PJ_DECL(pj_status_t) pj_base64_encode(const pj_uint8_t *input, int in_len, * length of the output. */ PJ_DECL(pj_status_t) pj_base64_decode(const pj_str_t *input, - pj_uint8_t *out, long *out_len); + pj_uint8_t *out, int *out_len); diff --git a/pjlib-util/src/pjlib-util-test/encryption.c b/pjlib-util/src/pjlib-util-test/encryption.c index 8fc2f828..62d03315 100644 --- a/pjlib-util/src/pjlib-util-test/encryption.c +++ b/pjlib-util/src/pjlib-util-test/encryption.c @@ -530,7 +530,7 @@ static int base64_test(void) pj_str_t input; int out_len = sizeof(output); - rc = pj_base64_encode(base64_test_vec[i].base256, + rc = pj_base64_encode((pj_uint8_t*)base64_test_vec[i].base256, strlen(base64_test_vec[i].base256), output, &out_len); if (rc != PJ_SUCCESS) @@ -545,7 +545,7 @@ static int base64_test(void) /* Decode test */ out_len = sizeof(output); - input.ptr = base64_test_vec[i].base64; + input.ptr = (char*)base64_test_vec[i].base64; input.slen = strlen(base64_test_vec[i].base64); rc = pj_base64_decode(&input, (pj_uint8_t*)output, &out_len); if (rc != PJ_SUCCESS) diff --git a/pjlib-util/src/pjlib-util/base64.c b/pjlib-util/src/pjlib-util/base64.c index 7bad4b4a..970de19c 100644 --- a/pjlib-util/src/pjlib-util/base64.c +++ b/pjlib-util/src/pjlib-util/base64.c @@ -119,7 +119,7 @@ PJ_DEF(pj_status_t) pj_base64_encode(const pj_uint8_t *input, int in_len, PJ_DEF(pj_status_t) pj_base64_decode(const pj_str_t *input, - pj_uint8_t *out, long *out_len) + pj_uint8_t *out, int *out_len) { const char *buf = input->ptr; int len = input->slen; |