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

     if(optget(opts, "debug")->enabled) {

 #if defined(C_LINUX)

-	    /* njh@bandsman.co.uk: create a dump if needed */

-	    struct rlimit rlim;

-

+	/* njh@bandsman.co.uk: create a dump if needed */

 	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;

 	if(setrlimit(RLIMIT_CORE, &rlim) < 0)

 	    perror("setrlimit");

@@ -19,8 +19,8 @@

 #ifdef CLAMUKO

-#ifndef __CLAMUKO_H

-#define __CLAMUKO_H

+#ifndef __CLAMUKOFS_H

+#define __CLAMUKOFS_H

 extern void *clamukofsth(void *arg);

@@ -233,7 +233,6 @@ int command(client_conn_t *conn, int *virus)

 	    break;

 	case COMMAND_MULTISCAN: {

 	    int multiscan, max, alive;

-	    struct stat sb;

 	    /* use MULTISCAN only for directories (bb #1869) */

 	    if (stat(conn->filename, &sb) == 0 &&

@@ -82,7 +82,6 @@ extern struct optstruct *clamdopts;

 static int isremote(const struct optstruct *opts) {

     int s, ret;

     const struct optstruct *opt;

-    const char *clamd_conf = optget(opts, "config-file")->strarg;

     static struct sockaddr_in testsock;

 #ifndef _WIN32

@@ -190,7 +190,7 @@ static int ftw_chkpath(const char *path, struct cli_ftw_cbdata *data)

  * This is used only in non IDSESSION mode

  * Returns the number of infected files or -1 on error */

 int dsresult(int sockd, int scantype, const char *filename, int *printok, int *errors) {

-    int infected = 0, len, beenthere = 0;

+    int infected = 0, len = 0, beenthere = 0;

     char *bol, *eol;

     struct RCVLN rcv;

     struct stat sb;

@@ -455,7 +455,7 @@ static int dspresult(struct client_parallel_data *c) {

 static int parallel_callback(struct stat *sb, char *filename, const char *path, enum cli_ftw_reason reason, struct cli_ftw_cbdata *data) {

     struct client_parallel_data *c = (struct client_parallel_data *)data->data;

     struct SCANID *cid;

-    int res;

+    int res = CL_CLEAN;

     if(chkpath(path))

 	return CL_SUCCESS;

@@ -64,7 +64,7 @@ cli_events_t *cli_events_new(unsigned max_event)

 void cli_events_free(cli_events_t *ev)

 {

     if (ev) {

-	//TODO: free components

+	/* TODO: free components */

 	free(ev->events);

 	free(ev);

     }

@@ -133,7 +133,7 @@ static inline int hm_cmp(const uint8_t *itm, const uint8_t *ref, unsigned int ke

     return memcmp(&itm[4], &ref[4], keylen - 4);

 }

-void hm_sort(struct cli_sz_hash *szh, size_t l, size_t r, unsigned int keylen) {

+static void hm_sort(struct cli_sz_hash *szh, size_t l, size_t r, unsigned int keylen) {

     uint8_t piv[32], tmph[32];

     size_t l1, r1;

@@ -814,7 +814,7 @@ int cli_fmap_scandesc(cli_ctx *ctx, cli_file_t ftype, uint8_t ftonly, struct cli

     return (acmode & AC_SCAN_FT) ? type : CL_CLEAN;

 }

-int cli_matchmeta(cli_ctx *ctx, const char *fname, size_t fsizec, size_t fsizer, int encrypted, int filepos, int res1, void *res2)

+int cli_matchmeta(cli_ctx *ctx, const char *fname, size_t fsizec, size_t fsizer, int encrypted, unsigned int filepos, int res1, void *res2)

 {

 	const struct cli_cdb *cdb;

@@ -171,6 +171,6 @@ int cli_caloff(const char *offstr, const struct cli_target_info *info, unsigned

 int cli_checkfp(unsigned char *digest, size_t size, cli_ctx *ctx);

-int cli_matchmeta(cli_ctx *ctx, const char *fname, size_t fsizec, size_t fsizer, int encrypted, int filepos, int res1, void *res2);

+int cli_matchmeta(cli_ctx *ctx, const char *fname, size_t fsizec, size_t fsizer, int encrypted, unsigned int filepos, int res1, void *res2);

 #endif

@@ -210,7 +210,7 @@ struct vinfo_list {

     unsigned int count;

 };

-int versioninfo_cb(void *opaque, uint32_t type, uint32_t name, uint32_t lang, uint32_t rva) {

+static int versioninfo_cb(void *opaque, uint32_t type, uint32_t name, uint32_t lang, uint32_t rva) {

     struct vinfo_list *vlist = (struct vinfo_list *)opaque;

     cli_dbgmsg("versioninfo_cb: type: %x, name: %x, lang: %x, rva: %x\n", type, name, lang, rva);

@@ -1326,7 +1326,7 @@ int cli_scanpe(cli_ctx *ctx)

 	    if(dirs[2].Size) {

 		    struct swizz_stats *stats = cli_calloc(1, sizeof(*stats));

 		    unsigned int m = 1000;

-		    int ret = CL_CLEAN;

+		    ret = CL_CLEAN;

 		    if (!stats)

 			    ret = CL_EMEM;

@@ -2211,11 +2211,11 @@ int cli_scanpe(cli_ctx *ctx)

     while (DCONF & PE_CONF_NSPACK) {

 	uint32_t eprva = vep;

-	uint32_t start_of_stuff, ssize, dsize, rep = ep;

+	uint32_t start_of_stuff, rep = ep;

 	unsigned int nowinldr;

 	char *nbuff;

-	char *src=epbuff, *dest;

+	src=epbuff;

 	if (*epbuff=='\xe9') { /* bitched headers */

 	    eprva = cli_readint32(epbuff+1)+vep+5;

 	    if (!(rep = cli_rawaddr(eprva, exe_sections, nsections, &err, fsize, hdr_size)) && err) break;

@@ -2466,7 +2466,6 @@ int cli_peheader(fmap_t *map, struct cli_exe_info *peinfo)

 	struct vinfo_list vlist;

 	uint8_t *vptr, *baseptr;

     	uint32_t rva, res_sz;

-	unsigned int i;

 	memset(&vlist, 0, sizeof(vlist));

     	findres(0x10, 0xffffffff, EC32(dirs[2].VirtualAddress), map, peinfo->section, peinfo->nsections, hdr_size, versioninfo_cb, &vlist);

@@ -86,6 +86,7 @@

 #include "7z.h"

 #include "fmap.h"

 #include "cache.h"

+#include "events.h"

 #ifdef HAVE_BZLIB_H

 #include <bzlib.h>

@@ -291,7 +291,7 @@ static int cdiff_cmd_del(const char *cmdstr, struct cdiff_ctx *ctx, char *lbuf,

 static int cdiff_cmd_xchg(const char *cmdstr, struct cdiff_ctx *ctx, char *lbuf, unsigned int lbuflen)

 {

 	char *arg, *arg2;

-	struct cdiff_node *pt, *last, *new;

+	struct cdiff_node *new;

 	unsigned int lineno;