Browse code

Eliminates a few warnings.

Micah Snyder authored on 2019/08/23 07:09:18
Showing 4 changed files
... ...
@@ -736,12 +736,6 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
736 736
     unsigned int selfchk;
737 737
     threadpool_t *thr_pool;
738 738
 
739
-#if defined(FANOTIFY) || defined(CLAMAUTH)
740
-    pthread_t fan_pid = 0;
741
-    pthread_attr_t fan_attr;
742
-    struct thrarg *tharg = NULL; /* shut up gcc */
743
-#endif
744
-
745 739
 #ifndef _WIN32
746 740
     memset(&sigact, 0, sizeof(struct sigaction));
747 741
 #endif
... ...
@@ -602,7 +602,7 @@ static void screnc_decode(unsigned char *ptr, struct screnc_state *s)
602 602
             expected += ((base64_chars[ptr[5]] >> 4) < 0 ? 0 : (base64_chars[ptr[5]] >> 4)) << 24;
603 603
             ptr += 8;
604 604
             if (s->sum != expected) {
605
-                cli_dbgmsg("screnc_decode: checksum mismatch: %u != %u\n", s->sum, expected);
605
+                cli_dbgmsg("screnc_decode: checksum mismatch: %u != %" PRIu64 "\n", s->sum, expected);
606 606
             } else {
607 607
                 if (strncmp((const char *)ptr, "^#~@", 4) != 0) {
608 608
                     cli_dbgmsg("screnc_decode: terminator not found\n");
... ...
@@ -1186,7 +1186,7 @@ cl_error_t cli_fmap_scandesc(cli_ctx *ctx, cli_file_t ftype, uint8_t ftonly, str
1186 1186
                 cl_hash_destroy(sha1ctx);
1187 1187
                 cl_hash_destroy(sha256ctx);
1188 1188
                 return ret;
1189
-            } else if ((acmode & AC_SCAN_FT) && ret >= CL_TYPENO) {
1189
+            } else if ((acmode & AC_SCAN_FT) && ((cli_file_t)ret >= CL_TYPENO)) {
1190 1190
                 if (ret > type)
1191 1191
                     type = ret;
1192 1192
             }
... ...
@@ -594,8 +594,6 @@ static cl_error_t cli_egg_scanmetadata(cl_egg_metadata *metadata, cli_ctx *ctx,
594 594
         status = CL_EUNPACK;
595 595
     }
596 596
 
597
-done:
598
-
599 597
     return status;
600 598
 }
601 599