diff options
author | Luo Jinghua <sunmoon1997@gmail.com> | 2009-11-08 20:59:40 +0800 |
---|---|---|
committer | Luo Jinghua <sunmoon1997@gmail.com> | 2009-11-08 20:59:40 +0800 |
commit | 6acb8b8c8c928b63840a79738a4c83db55e055b4 (patch) | |
tree | 9d573820f68251f5abe93533b7a1031bbc824132 | |
parent | a9531d9846a77fbf66005e4b7484eaab14b4780c (diff) |
milkway: constify mw_checksum_update and fixed all warnnings
-rw-r--r-- | milkway/base32.c | 8 | ||||
-rw-r--r-- | milkway/base32.h | 10 | ||||
-rw-r--r-- | milkway/mw-checksum.c | 2 | ||||
-rw-r--r-- | milkway/mw-checksum.h | 2 | ||||
-rw-r--r-- | milkway/sha1.c | 4 | ||||
-rw-r--r-- | milkway/sha1.h | 2 |
6 files changed, 12 insertions, 16 deletions
diff --git a/milkway/base32.c b/milkway/base32.c index 0ccd4c0..913f7bf 100644 --- a/milkway/base32.c +++ b/milkway/base32.c @@ -12,9 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "milkwayint.h" /* License * ------- @@ -41,10 +39,10 @@ * UIA programs. */ -#include "base32.h" - #include <string.h> +#include "base32.h" + // Decoding table for our base32 encoding scheme static const signed char dectab[256] = { -1, -1, -1, -1, -1, -1, -1, -1, // Control chars diff --git a/milkway/base32.h b/milkway/base32.h index 7feecbe..ee6d12b 100644 --- a/milkway/base32.h +++ b/milkway/base32.h @@ -15,19 +15,17 @@ #ifndef MW_BASE32_H #define MW_BASE32_H -#include "milkwayint.h" - -size_t +mw_private size_t mw_base32_encode_length(size_t len); -size_t +mw_private size_t mw_base32_decode_length(size_t len); -int +mw_private int mw_base32_encode(const void *in, size_t inlen, char *out, size_t outlen); -int +mw_private int mw_base32_decode(const char *in, size_t inlen, void *out, size_t *outlen); diff --git a/milkway/mw-checksum.c b/milkway/mw-checksum.c index 9c9a78d..c3526e2 100644 --- a/milkway/mw-checksum.c +++ b/milkway/mw-checksum.c @@ -56,7 +56,7 @@ mw_checksum_destroy(mw_checksum_t *self) } int -mw_checksum_update(mw_checksum_t* self, void *data, size_t length) +mw_checksum_update(mw_checksum_t* self, const void *data, size_t length) { switch (self->mode) { case MW_CHECKSUM_MD5: diff --git a/milkway/mw-checksum.h b/milkway/mw-checksum.h index 4f15c6d..eca3654 100644 --- a/milkway/mw-checksum.h +++ b/milkway/mw-checksum.h @@ -32,7 +32,7 @@ mw_public void mw_checksum_destroy(mw_checksum_t *self); mw_public int -mw_checksum_update(mw_checksum_t *self, void *data, size_t length); +mw_checksum_update(mw_checksum_t *self, const void *data, size_t length); mw_public int mw_checksum_final(mw_checksum_t *self); diff --git a/milkway/sha1.c b/milkway/sha1.c index c210771..2804fc5 100644 --- a/milkway/sha1.c +++ b/milkway/sha1.c @@ -55,7 +55,7 @@ typedef union _BYTE64QUAD16 { } BYTE64QUAD16; /* Hash a single 512-bit block. This is the core of the algorithm. */ -static void SHA1Transform(sha1_quadbyte state[5], sha1_byte buffer[64]) +static void SHA1Transform(sha1_quadbyte state[5], const sha1_byte buffer[64]) { sha1_quadbyte a, b, c, d, e; BYTE64QUAD16 *block; @@ -112,7 +112,7 @@ void SHA1Init(SHA_CTX* context) } /* Run your data through this. */ -void SHA1Update(SHA_CTX *context, sha1_byte *data, unsigned int len) +void SHA1Update(SHA_CTX *context, const sha1_byte *data, unsigned int len) { unsigned int i, j; diff --git a/milkway/sha1.h b/milkway/sha1.h index 77708b8..8988c7f 100644 --- a/milkway/sha1.h +++ b/milkway/sha1.h @@ -56,7 +56,7 @@ typedef struct _SHA_CTX { } SHA_CTX; mw_private void SHA1Init(SHA_CTX *context); -mw_private void SHA1Update(SHA_CTX *context, sha1_byte *data, unsigned int len); +mw_private void SHA1Update(SHA_CTX *context, const sha1_byte *data, unsigned int len); mw_private void SHA1Final(sha1_byte digest[SHA1_DIGEST_LENGTH], SHA_CTX* context); #ifdef __cplusplus |