Char encoding updates and misc. fixes

[wimlib] / src / sha1.c

diff --git a/src/sha1.c b/src/sha1.c
index 0553b63cf8e4091de7e11a7bab1fb86983386da6..6fb18c4d10983462a002cd752dc42c2a74ae27b8 100644 (file)
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -66,7 +66,8 @@ sha1_update(SHA_CTX *context, const void *data, size_t len)
 {
        sha1_update_intel((int*)&context->state, data, len / 64);
        size_t j = (context->count[0] >> 3) & 63;
-       if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+       if ((context->count[0] += len << 3) < (len << 3))
+               context->count[1]++;
        context->count[1] += (len >> 29);
 }
 #include <stdlib.h>
@@ -234,21 +235,21 @@ sha1_stream(FILE *fp, u8 md[SHA1_HASH_SIZE])
 /* Calculates the SHA1 message digest of a file.  @md must point to a buffer of
  * length 20 bytes into which the message digest is written. */
 int
-sha1sum(const mbchar *filename, u8 md[SHA1_HASH_SIZE])
+sha1sum(const tchar *filename, u8 md[SHA1_HASH_SIZE])
 {
        FILE *fp;
        int ret;
 
-       fp = fopen(filename, "rb");
+       fp = tfopen(filename, T("rb"));
        if (!fp) {
-               ERROR_WITH_ERRNO("Cannot open the file `%s' for reading",
+               ERROR_WITH_ERRNO("Cannot open the file `%"TS"' for reading",
                                 filename);
                return WIMLIB_ERR_OPEN;
        }
        ret = sha1_stream(fp, md);
        if (ret != 0) {
                ERROR_WITH_ERRNO("Error calculating SHA1 message digest of "
-                                "`%s'", filename);
+                                "`%"TS"'", filename);
        }
        fclose(fp);
        return ret;