@@ -112,16 +112,19 @@ static void tracehook(struct cli_bc_ctx *ctx, unsigned event)

 static void tracehook_op(struct cli_bc_ctx *ctx, const char *op)

 {

+    UNUSEDPARAM(ctx);

     fprintf(stderr, "[trace] %s\n", op);

 }

 static void tracehook_val(struct cli_bc_ctx *ctx, const char *name, uint32_t value)

 {

+    UNUSEDPARAM(ctx);

     fprintf(stderr, "[trace] %s = %u\n", name, value);

 }

 static void tracehook_ptr(struct cli_bc_ctx *ctx, const void *ptr)

 {

+    UNUSEDPARAM(ctx);

     fprintf(stderr, "[trace] %p\n", ptr);

 }

@@ -76,6 +76,7 @@ short foreground = 0;

 char hostid[37];

 char *get_hostid(void *cbdata);

+int is_valid_hostid(void);

 static void help(void)

 {

@@ -118,11 +119,12 @@ int main(int argc, char **argv)

     time_t currtime;

     const char *dbdir, *cfgfile;

     char *pua_cats = NULL, *pt;

-    int ret, tcpsock = 0, localsock = 0, i, min_port, max_port;

+    int ret, tcpsock = 0, localsock = 0, min_port, max_port;

     unsigned int sigs = 0;

     int *lsockets=NULL;

     unsigned int nlsockets = 0;

     unsigned int dboptions = 0;

+    unsigned int i;

 #ifdef C_LINUX

     STATBUF sb;

 #endif

@@ -576,8 +578,6 @@ int main(int argc, char **argv)

         }

         if(tcpsock) {

-            int *t;

-

             opt = optget(opts, "TCPAddr");

             if (opt->enabled) {

                 int breakout = 0;

@@ -670,7 +670,7 @@ int main(int argc, char **argv)

         if(!optget(opts, "Foreground")->enabled) {

 #ifdef C_BSD	    

             /* workaround for OpenBSD bug, see https://wwws.clamav.net/bugzilla/show_bug.cgi?id=885 */

-            for(ret=0;ret<nlsockets;ret++) {

+            for(ret=0;(unsigned int)ret<nlsockets;ret++) {

                 if (fcntl(lsockets[ret], F_SETFL, fcntl(lsockets[ret], F_GETFL) | O_NONBLOCK) == -1) {

                     logg("!fcntl for lsockets[] failed\n");

                     close(lsockets[ret]);

@@ -688,7 +688,7 @@ int main(int argc, char **argv)

             }

             gengine = NULL;

 #ifdef C_BSD

-            for(ret=0;ret<nlsockets;ret++) {

+            for(ret=0;(unsigned int)ret<nlsockets;ret++) {

                 if (fcntl(lsockets[ret], F_SETFL, fcntl(lsockets[ret], F_GETFL) & ~O_NONBLOCK) == -1) {

                     logg("!fcntl for lsockets[] failed\n");

                     close(lsockets[ret]);

@@ -766,6 +766,8 @@ int is_valid_hostid(void)

 char *get_hostid(void *cbdata)

 {

+    UNUSEDPARAM(cbdata);

+

     if (!strcmp(hostid, "none"))

         return NULL;

@@ -517,6 +517,8 @@ fds_poll_recv (struct fd_data *data, int timeout, int check_signals,

     int retval;

     time_t now, closest_timeout;

+    UNUSEDPARAM(event);

+

     /* we must have at least one fd, the control fd! */

     fds_cleanup (data);

 #ifndef _WIN32

@@ -76,6 +76,8 @@ void msg_callback(enum cl_msg severity, const char *fullmsg, const char *msg, vo

     struct cb_context *c = ctx;

     const char *filename = (c && c->filename) ? c->filename : "";

+    UNUSEDPARAM(fullmsg);

+

     switch (severity) {

 	case CL_MSG_ERROR:

 	    logg("^[LibClamAV] %s: %s", filename, msg);

@@ -95,10 +97,13 @@ void msg_callback(enum cl_msg severity, const char *fullmsg, const char *msg, vo

 void hash_callback(int fd, unsigned long long size, const unsigned char *md5, const char *virname, void *ctx)

 {

     struct cb_context *c = ctx;

+    UNUSEDPARAM(fd);

+    UNUSEDPARAM(virname);

+

     if (!c)

 	return;

     c->virsize = size;

-    strncpy(c->virhash, md5, 32);

+    strncpy(c->virhash, (const char *)md5, 32);

     c->virhash[32] = '\0';

 }

@@ -346,6 +351,8 @@ int scanfd(const client_conn_t *conn, unsigned long int *scanned,

 	char fdstr[32];

 	const char*reply_fdstr;

+    UNUSEDPARAM(odesc);

+

 	if (stream) {

 	    struct sockaddr_in sa;

 	    socklen_t salen = sizeof(sa);

@@ -76,11 +76,12 @@ extern struct optstruct *clamdopts;

 static int isremote(const struct optstruct *opts) {

     int s, ret;

     const struct optstruct *opt;

-    static struct sockaddr_in testsock;

     char *ipaddr, port[10];

     struct addrinfo hints, *info, *p;

     int res;

+    UNUSEDPARAM(opts);

+

 #ifndef _WIN32

     if((opt = optget(clamdopts, "LocalSocket"))->enabled) {

         memset((void *)&nixsock, 0, sizeof(nixsock));

@@ -236,6 +236,7 @@ static int chkpath(const char *path)

 static int ftw_chkpath(const char *path, struct cli_ftw_cbdata *data)

 {

+    UNUSEDPARAM(data);

     return chkpath(path);

 }

@@ -378,6 +379,8 @@ static int serial_callback(STATBUF *sb, char *filename, const char *path, enum c

     int sockd, ret;

     const char *f = filename;

+    UNUSEDPARAM(sb);

+

     if(chkpath(path))

 	return CL_SUCCESS;

     c->files++;

@@ -532,6 +535,8 @@ static int parallel_callback(STATBUF *sb, char *filename, const char *path, enum

     struct SCANID *cid;

     int res = CL_CLEAN;

+    UNUSEDPARAM(sb);

+

     if(chkpath(path))

 	return CL_SUCCESS;

     c->files++;

@@ -57,6 +57,7 @@

 #include <assert.h>

 #include <errno.h>

+#include "libclamav/clamav.h"

 #include "shared/optparser.h"

 #include "shared/misc.h"

@@ -101,6 +102,9 @@ static void cleanup(void);

 static int send_string_noreconn(conn_t *conn, const char *cmd);

 static void send_string(conn_t *conn, const char *cmd);

 static int read_version(conn_t *conn);

+char *get_ip(const char *ip);

+char *get_port(const char *ip);

+char *make_ip(const char *host, const char *port);

 enum exit_reason {

         FAIL_CMDLINE=1,

@@ -509,7 +513,7 @@ static void print_con_info(conn_t *conn, const char *fmt, ...)

 char *get_ip(const char *ip)

 {

-    char *dupip, *p1, *p2;

+    char *dupip, *p1;

     unsigned int i;

     /*

@@ -608,7 +612,7 @@ static int make_connection_real(const char *soname, conn_t *conn)

     int s;

     struct timeval tv;

     char *port=NULL;

-    char *name, *pt = strdup(soname);

+    char *pt = strdup(soname);

     const char *host = pt;

     struct addrinfo hints, *res=NULL, *p;

     int err;

@@ -1217,6 +1221,7 @@ static int read_version(conn_t *conn)

 static void sigint(int a)

 {

+    UNUSEDPARAM(a);

 	EXIT_PROGRAM(SIGINT_REASON);

 }

@@ -69,6 +69,7 @@ dev_t procdev;

 char hostid[37];

+int is_valid_hostid(void);

 char *get_hostid(void *cbdata);

 #ifdef _WIN32

@@ -135,6 +136,8 @@ struct metachain {

 static cl_error_t pre(int fd, const char *type, void *context)

 {

     struct metachain *c = context;

+    UNUSEDPARAM(fd);

+

     if (c) {

 	c->level++;

     }

@@ -162,9 +165,11 @@ static int print_chain(struct metachain *c, char *str, unsigned len)

 static cl_error_t post(int fd, int result, const char *virname, void *context)

 {

     struct metachain *c = context;

+    UNUSEDPARAM(fd);

+    UNUSEDPARAM(result);

     if (c && c->n) {

 	char str[128];

-	int toolong = print_chain(c, str, sizeof(str));

+	print_chain(c, str, sizeof(str));

 	if (c->level == c->lastadd && !virname)

 	    free(c->chains[--c->n]);

 	if (virname && !c->lastvir)

@@ -178,7 +183,6 @@ static cl_error_t post(int fd, int result, const char *virname, void *context)

 static cl_error_t meta(const char* container_type, unsigned long fsize_container, const char *filename,

 		       unsigned long fsize_real,  int is_encrypted, unsigned int filepos_container, void *context)

 {

-    int na = 0;

     char prev[128];

     struct metachain *c = context;

     const char *type = !strncmp(container_type,"CL_TYPE_",8) ? container_type + 8 : container_type;

@@ -187,6 +191,11 @@ static cl_error_t meta(const char* container_type, unsigned long fsize_container

     char **chains;

     int toolong;

+    UNUSEDPARAM(fsize_container);

+    UNUSEDPARAM(fsize_real);

+    UNUSEDPARAM(is_encrypted);

+    UNUSEDPARAM(filepos_container);

+

     if (!c)

 	return CL_CLEAN;

     chain = malloc(n);

@@ -1063,6 +1072,8 @@ int is_valid_hostid(void)

 char *get_hostid(void *cbdata)

 {

+    UNUSEDPARAM(cbdata);

+

     if (!strcmp(hostid, "none"))

         return NULL;

@@ -13,6 +13,8 @@

 #define OPTS "e:p:n:N:H:h?v"

 char *read_stream(void);

+void usage(char *name);

+void version(void);

 void usage(char *name)

 {

@@ -41,9 +43,7 @@ int main(int argc, char *argv[])

     int ch;

     struct curl_httppost *post=NULL, *last=NULL;

     struct curl_slist *slist = NULL;

-    char *type;

     char *name=NULL, *email=NULL, *filename=NULL;

-    struct cl_engine *engine;

     int setURL=0, fromStream=0;

     curl_global_init(CURL_GLOBAL_ALL);

@@ -72,6 +72,7 @@ char hostid[37];

 void submit_host_info(struct optstruct *opts);

 char *get_hostid(void *cbdata);

+int is_valid_hostid(void);

 static void

 sighandler (int sig)

@@ -262,6 +263,9 @@ static void

 msg_callback (enum cl_msg severity, const char *fullmsg, const char *msg,

               void *ctx)

 {

+    UNUSEDPARAM(fullmsg);

+    UNUSEDPARAM(ctx);

+

     switch (severity)

     {

     case CL_MSG_ERROR:

@@ -742,7 +746,6 @@ main (int argc, char **argv)

 void submit_host_info(struct optstruct *opts)

 {

-    struct optstruct *opt;

     struct cl_engine *engine;

     cli_intel_t *intel;

@@ -812,6 +815,8 @@ int is_valid_hostid(void)

 char *get_hostid(void *cbdata)

 {

+    UNUSEDPARAM(cbdata);

+

     if (!strcmp(hostid, "none"))

         return NULL;

@@ -881,6 +881,10 @@ getfile_mirman (const char *srcfile, const char *destfile,

     char *remotename = NULL, *authorization = NULL, *headerline;

     const char *rotation = "|/-\\", *fname;

+    UNUSEDPARAM(localip);

+    UNUSEDPARAM(port);

+    UNUSEDPARAM(ctimeout);

+    UNUSEDPARAM(can_whitelist);

     if (proxy)

     {

@@ -1114,6 +1118,8 @@ getfile (const char *srcfile, const char *destfile, const char *hostname,

     int ret, sd;

     char ipaddr[46];

+    UNUSEDPARAM(opts);

+

     memset (ipaddr, 0, sizeof (ipaddr));

     if (ip && ip[0])            /* use ip to connect */

         sd = wwwconnect (ip, proxy, port, ipaddr, localip, ctimeout, mdat,

@@ -178,6 +178,8 @@ static int cdiff_cmd_open(const char *cmdstr, struct cdiff_ctx *ctx, char *lbuf,

 	char *db;

 	unsigned int i;

+    UNUSEDPARAM(lbuf);

+    UNUSEDPARAM(lbuflen);

     if(!(db = cdiff_token(cmdstr, 1, 1))) {

 	logg("!cdiff_cmd_open: Can't get first argument\n");

@@ -207,6 +209,8 @@ static int cdiff_cmd_add(const char *cmdstr, struct cdiff_ctx *ctx, char *lbuf,

 	char *sig;

 	struct cdiff_node *new;

+    UNUSEDPARAM(lbuf);

+    UNUSEDPARAM(lbuflen);

     if(!(sig = cdiff_token(cmdstr, 1, 1))) {

 	logg("!cdiff_cmd_add: Can't get first argument\n");

@@ -237,6 +241,9 @@ static int cdiff_cmd_del(const char *cmdstr, struct cdiff_ctx *ctx, char *lbuf,

 	struct cdiff_node *pt, *last, *new;

 	unsigned int lineno;

+    UNUSEDPARAM(lbuf);

+    UNUSEDPARAM(lbuflen);

+

     if(!(arg = cdiff_token(cmdstr, 1, 0))) {

 	logg("!cdiff_cmd_del: Can't get first argument\n");

@@ -294,6 +301,9 @@ static int cdiff_cmd_xchg(const char *cmdstr, struct cdiff_ctx *ctx, char *lbuf,

 	struct cdiff_node *new;

 	unsigned int lineno;

+    UNUSEDPARAM(lbuf);

+    UNUSEDPARAM(lbuflen);

+

     if(!(arg = cdiff_token(cmdstr, 1, 0))) {

 	logg("!cdiff_cmd_xchg: Can't get first argument\n");

@@ -340,6 +350,8 @@ static int cdiff_cmd_close(const char *cmdstr, struct cdiff_ctx *ctx, char *lbuf

 	char *tmp;

 	FILE *fh, *tmpfh;

+    UNUSEDPARAM(cmdstr);

+

     if(!ctx->open_db) {

 	logg("!cdiff_cmd_close: No database to close\n");

@@ -681,6 +693,8 @@ static int cdiff_cmd_unlink(const char *cmdstr, struct cdiff_ctx *ctx, char *lbu

 	char *db;

 	unsigned int i;

+    UNUSEDPARAM(lbuf);

+    UNUSEDPARAM(lbuflen);

     if(ctx->open_db) {

 	logg("!cdiff_cmd_unlink: Database %s is still open\n", ctx->open_db);

@@ -32,6 +32,10 @@

 #include <fcntl.h>

 #include <errno.h>

+#if !defined(_WIN32)

+#include <sys/socket.h>

+#endif

+

 #include "shared/output.h"

 #include "shared/clamdcom.h"

@@ -303,7 +303,7 @@ static char *getdsig(const char *host, const char *user, const unsigned char *da

 	    return NULL;

 	}

 #endif

-	if(scanf("%as", &pt) == EOF || !pt) {

+	if(scanf("%s", &pt) == EOF || !pt) {

 	    mprintf("!getdsig: Can't get password\n");

 #ifdef HAVE_TERMIOS_H

 	    tcsetattr(0, TCSAFLUSH, &old);

@@ -848,7 +848,7 @@ static int build(const struct optstruct *opts)

 	builder[sizeof(builder)-1]='\0';

     } else {

 	mprintf("Builder name: ");

-	if(scanf("%as", &pt) == EOF || !pt) {

+	if(scanf("%s", &pt) == EOF || !pt) {

 	    mprintf("!build: Can't get builder name\n");

 	    return -1;

 	}

@@ -1,6 +1,10 @@

 #include <stdio.h>

+#include "../libclamav/clamav.h"

+

 int main(int argc, char **argv)

 {

+    UNUSEDPARAM(argc);

+    UNUSEDPARAM(argv);

     puts("\n*** Unit tests disabled in this build\n*** Use ./configure --enable-check to enable them\n");

     /* tell automake the test was skipped */

     return 77;

@@ -18,6 +18,7 @@

  *  MA 02110-1301, USA.

  */

+#include "../libclamav/clamav.h"

 #include "../libclamav/fpu.h"

 /* Helper command line interface to determinine fpu endianess in unit test scripts.

@@ -30,5 +31,7 @@

 int main (int argc, char **argv)

 {

+    UNUSEDPARAM(argc);

+    UNUSEDPARAM(argv);

     return  get_fpu_endian();

 }