parse: add posval support to FIO_OPT_INT

[fio.git] / crc / sha256.c

diff --git a/crc/sha256.c b/crc/sha256.c
index 8ec2943294e48ac2a3e9e22892a0723fa05b4f8e..3a72a5bfb2e14bbcc0d718acfa9e296ec9c48ded 100644 (file)
--- a/crc/sha256.c
+++ b/crc/sha256.c
@@ -18,17 +18,10 @@
  */
 #include <string.h>
 #include <inttypes.h>
-#include <byteswap.h>
-#include <endian.h>
 
+#include "../lib/bswap.h"
 #include "sha256.h"
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define        __be32_to_cpu(x)        __bswap_32(x)
-#else
-#define __be32_to_cpu(x)       (x)
-#endif
-
 #define SHA256_DIGEST_SIZE     32
 #define SHA256_HMAC_BLOCK_SIZE 64
 
@@ -234,7 +227,7 @@ static void sha256_transform(uint32_t *state, const uint8_t *input)
        memset(W, 0, 64 * sizeof(uint32_t));
 }
 
-void sha256_init(struct sha256_ctx *sctx)
+void fio_sha256_init(struct fio_sha256_ctx *sctx)
 {
        sctx->state[0] = H0;
        sctx->state[1] = H1;
@@ -247,13 +240,13 @@ void sha256_init(struct sha256_ctx *sctx)
        sctx->count[0] = sctx->count[1] = 0;
 }
 
-void sha256_update(struct sha256_ctx *sctx, const uint8_t *data,
-                  unsigned int len)
+void fio_sha256_update(struct fio_sha256_ctx *sctx, const uint8_t *data,
+                      unsigned int len)
 {
-       unsigned int i, index, part_len;
+       unsigned int i, idx, part_len;
 
        /* Compute number of bytes mod 128 */
-       index = (unsigned int)((sctx->count[0] >> 3) & 0x3f);
+       idx = (unsigned int)((sctx->count[0] >> 3) & 0x3f);
 
        /* Update number of bits */
        if ((sctx->count[0] += (len << 3)) < (len << 3)) {
@@ -261,20 +254,20 @@ void sha256_update(struct sha256_ctx *sctx, const uint8_t *data,
                sctx->count[1] += (len >> 29);
        }
 
-       part_len = 64 - index;
+       part_len = 64 - idx;
 
        /* Transform as many times as possible. */
        if (len >= part_len) {
-               memcpy(&sctx->buf[index], data, part_len);
+               memcpy(&sctx->buf[idx], data, part_len);
                sha256_transform(sctx->state, sctx->buf);
 
                for (i = part_len; i + 63 < len; i += 64)
                        sha256_transform(sctx->state, &data[i]);
-               index = 0;
+               idx = 0;
        } else {
                i = 0;
        }
        
        /* Buffer remaining input */
-       memcpy(&sctx->buf[index], &data[i], len-i);
+       memcpy(&sctx->buf[idx], &data[i], len-i);
 }