From 9b776baaf443c0ff0c14da03fa429e0d43401480 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Wed, 28 Jul 2021 08:49:32 -0400 Subject: remove compile warnings --- src/fids/db.c | 3 +-- src/fids/main.c | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/fids/db.c b/src/fids/db.c index e0021bc48..35caf7eeb 100644 --- a/src/fids/db.c +++ b/src/fids/db.c @@ -32,11 +32,10 @@ static DB *database[HASH_MAX] = {NULL}; // djb2 hash function by Dan Bernstein static unsigned hash(const char *str) { - const unsigned char *s = (unsigned char *) str; unsigned long hash = 5381; int c; - while (c = *s++) + while ((c = *str++) != '\0') hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ return hash & (HASH_MAX - 1); diff --git a/src/fids/main.c b/src/fids/main.c index b53a9828e..c899b55e1 100644 --- a/src/fids/main.c +++ b/src/fids/main.c @@ -47,9 +47,10 @@ static inline int is_dir(const char *fname) { assert(fname); struct stat s; - int rv = stat(fname, &s); - if (S_ISDIR(s.st_mode)) - return 1; + if (stat(fname, &s) == 0) { + if (S_ISDIR(s.st_mode)) + return 1; + } return 0; } @@ -116,7 +117,7 @@ static void file_checksum(const char *fname) { // calculate blake2 checksum char str_checksum[(KEY_SIZE / 8) * 2 + 1]; - int i; + int long unsigned i; char *ptr = str_checksum; for (i = 0; i < sizeof(checksum); i++, ptr += 2) sprintf(ptr, "%02x", (unsigned char ) checksum[i]); @@ -190,7 +191,7 @@ void globbing(const char *fname) { exit(1); } - int i; + long unsigned i; for (i = 0; i < globbuf.gl_pathc; i++) { char *path = globbuf.gl_pathv[i]; assert(path); -- cgit v1.2.3-54-g00ecf