@@ -462,15 +462,16 @@ static always_inline struct stack_entry *pop_stack(struct stack *stack,

 #define DEFINE_OP_BC_RET_N(OP, T, R0, W0) \

     case OP: {\

+                operand_t ret;\

                 T tmp;\

                 R0(tmp, inst->u.unaryop);\

                 CHECK_GT(stack_depth, 0);\

                 stack_depth--;\

-                stack_entry = pop_stack(&stack, stack_entry, &func, &i, &bb,\

+                stack_entry = pop_stack(&stack, stack_entry, &func, &ret, &bb,\

                                         &bb_inst);\

                 values = stack_entry ? stack_entry->values : ctx->values;\

-                CHECK_GT(func->numBytes, i);\

-                W0(i, tmp);\

+                CHECK_GT(func->numBytes, ret);\

+                W0(ret, tmp);\

                 if (!bb) {\

                     stop = CL_BREAK;\

                     continue;\

@@ -706,7 +707,7 @@ int cli_vm_execute(const struct cli_bc *bc, struct cli_bc_ctx *ctx, const struct

             DEFINE_BINOP(OP_BC_XOR, res = op0 ^ op1);

             DEFINE_SCASTOP(OP_BC_SEXT,

-                          CHOOSE(READ1(sres, inst->u.cast.source); res = sres ? ~0ull : 0,

+                          CHOOSE(READ1(sres, inst->u.cast.source); res = sres ? ~0 : 0,

                                  READ8(sres, inst->u.cast.source); res=sres=SIGNEXT(sres, inst->u.cast.mask),

                                  READ16(sres, inst->u.cast.source); res=sres=SIGNEXT(sres, inst->u.cast.mask),

                                  READ32(sres, inst->u.cast.source); res=sres=SIGNEXT(sres, inst->u.cast.mask),

@@ -1,7 +1,7 @@

 /*

  *  HTML Entity & Encoding normalization.

  *

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2008 Sourcefire, Inc.

  *

  *  Authors: Török Edvin

@@ -49,7 +49,7 @@ struct entity_conv {

 	unsigned char entity_buff[MAX_ENTITY_SIZE+2];

 };

-enum encodings {E_UCS4,E_UTF16,E_UCS4_1234,E_UCS4_4321,E_UCS4_2143,E_UCS4_3412,E_UTF16_BE,E_UTF16_LE,E_UTF8, E_UNKNOWN,E_OTHER, E_ICONV};

+enum encodings {E_UCS4,E_UTF16,E_UCS4_1234,E_UCS4_4321,E_UCS4_2143,E_UCS4_3412,E_UTF16_BE,E_UTF16_LE,E_UTF8, E_UNKNOWN,E_OTHER};

 unsigned char* u16_normalize_tobuffer(uint16_t u16, unsigned char* dst, size_t dst_size);

 const char* entity_norm(struct entity_conv* conv,const unsigned char* entity);

@@ -187,6 +187,9 @@ void cli_event_int(cli_events_t *ctx, unsigned id, uint64_t arg)

         ev_chain(ctx, ev, &val);

         break;

     }

+    default:

+        // TODO: Consider if we should handle multiple_concat cases.

+        break;

     }

 }

@@ -273,6 +276,9 @@ static void event_string(cli_events_t *ctx, struct cli_event *ev, const char *st

         ev_chain(ctx, ev, &val);

         break;

     }

+    default:

+        // TODO: Consider if we should handle multiple_sum, multiple_concat cases.

+        break;

     }

 }

@@ -339,6 +345,9 @@ void cli_event_data(cli_events_t *ctx, unsigned id, const void *data, uint32_t l

         }

         break;

     }

+    default:

+        // TODO: Consider if we should handle multiple_sum, multiple_chain cases.

+        break;

     }

 }

@@ -397,6 +406,9 @@ static inline void ev_debug(enum ev_type type, union ev_val *val, uint32_t count

         cli_dbgmsg("\t(%u): %d.%06us\n", count, (signed)(val->v_int / 1000000),

                    (unsigned)(val->v_int % 1000000));

         break;

+    default:

+        // TODO: Consider if we should handle ev_none cases.

+        break;

     }

 }

@@ -463,6 +475,9 @@ static int ev_diff(enum ev_type type, union ev_val *v1, union ev_val *v2, uint32

         return memcmp(v1->v_data, v2->v_data, count);

     case ev_time:

         return 0;

+    default:

+        // TODO: Consider if we should handle ev_none cases.

+        break;

     }

     return 0;

 }

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2014 Sourcefire, Inc.

  *

  *  Authors: Kevin Lin <klin@sourcefire.com>

@@ -288,7 +288,7 @@ static int gpt_scan_partitions(cli_ctx *ctx, struct gpt_header hdr, size_t secto

     /* print header info for the debug */

     cli_dbgmsg("GPT Header:\n");

-    cli_dbgmsg("Signature: 0x%llx\n", hdr.signature);

+    cli_dbgmsg("Signature: 0x%llx\n", (long long unsigned)hdr.signature);

     cli_dbgmsg("Revision: %x\n", hdr.revision);

     gpt_printGUID(hdr.DiskGUID, "DISK GUID");

     cli_dbgmsg("Partition Entry Count: %u\n", hdr.tableNumEntries);

@@ -341,10 +341,10 @@ static int gpt_scan_partitions(cli_ctx *ctx, struct gpt_header hdr, size_t secto

             gpt_printName(gpe.name, "Name");

             gpt_printGUID(gpe.typeGUID, "Type GUID");

             gpt_printGUID(gpe.uniqueGUID, "Unique GUID");

-            cli_dbgmsg("Attributes: %llx\n", gpe.attributes);

+            cli_dbgmsg("Attributes: %llx\n", (long long unsigned)gpe.attributes);

             cli_dbgmsg("Blocks: [%llu(%llu) -> %llu(%llu)]\n",

-                       gpe.firstLBA, (gpe.firstLBA * sectorsize), 

-                       gpe.lastLBA, ((gpe.lastLBA+1) * sectorsize));

+                (long long unsigned)gpe.firstLBA, (long long unsigned)(gpe.firstLBA * sectorsize), 

+                (long long unsigned)gpe.lastLBA, (long long unsigned)((gpe.lastLBA+1) * sectorsize));

             /* send the partition to cli_map_scan */

             part_off = gpe.firstLBA * sectorsize;

@@ -414,7 +414,7 @@ static int gpt_validate_header(cli_ctx *ctx, struct gpt_header hdr, size_t secto

     /* check signature */

     if (hdr.signature != GPT_SIGNATURE) {

         cli_dbgmsg("cli_scangpt: Invalid GPT header signature %llx\n",

-                   hdr.signature);

+            (long long unsigned)hdr.signature);

         return CL_EFORMAT;

     }

@@ -3563,7 +3563,7 @@ print_trace(int use_syslog)

 	for(i = 0; i < size; i++) {

 		cli_errmsg("%s\n", strings[i]);

 		if(use_syslog)

-			syslog(LOG_ERR, "bt[%u]: %s", i, strings[i]);

+			syslog(LOG_ERR, "bt[%llu]: %s", (unsigned long long)i, strings[i]);

 	}

 #ifdef	SAVE_TMP

@@ -1,7 +1,7 @@

 /*

  * Extract component parts of OLE2 files (e.g. MS Office Documents)

  * 

- * Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ * Copyright (C) 2015, 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  * Copyright (C) 2007-2013 Sourcefire, Inc.

  * 

  * Authors: Kevin Lin

@@ -913,7 +913,7 @@ int cli_ole2_summary_json(cli_ctx *ctx, int fd, int mode)

         return CL_EMAP;

     }

     sctx.maplen = sctx.sfmap->len;

-    cli_dbgmsg("ole2_summary_json: streamsize: %u\n", sctx.maplen);

+    cli_dbgmsg("ole2_summary_json: streamsize: %zu\n", sctx.maplen);

     switch (mode) {

     case 1:

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2013 Sourcefire, Inc.

  *

  *  Authors: Steven Morgan <smorgan@sourcefire.com>

@@ -127,8 +127,8 @@ static void xar_get_checksum_values(xmlTextReaderPtr reader, unsigned char ** ck

         xmlval = xmlTextReaderConstValue(reader);

         if (xmlval) {

             cli_dbgmsg("cli_scanxar: checksum value is %s.\n", xmlval);

-            if (*hash == XAR_CKSUM_SHA1 && xmlStrlen(xmlval) == 2 * CLI_HASHLEN_SHA1 ||

-                *hash == XAR_CKSUM_MD5 && xmlStrlen(xmlval) == 2 * CLI_HASHLEN_MD5)

+            if (( (*hash == XAR_CKSUM_SHA1)  &&  (xmlStrlen(xmlval) == 2 * CLI_HASHLEN_SHA1))  ||

+                ( (*hash == XAR_CKSUM_MD5)  &&  (xmlStrlen(xmlval) == 2 * CLI_HASHLEN_MD5) ))

                 {

                     *cksum = xmlStrdup(xmlval); 

                 } 

@@ -1,7 +1,7 @@

 /*

  * YARA parser for ClamAV: back-end functions

  * 

- * Copyright (C) 2014 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ * Copyright (C) 2014, 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  * 

  * Authors: Steven Morgan

  * 

@@ -703,7 +703,7 @@ int yr_parser_reduce_rule_declaration(

   YR_RULE* rule;

   YR_STRING* string;

-  int8_t halt = OP_HALT;

+  uint8_t halt = OP_HALT;

   if (yr_hash_table_lookup(

         compiler->rules_table,

@@ -151,6 +151,7 @@ struct qm_trace {

 /*

  * Singly-linked List declarations.

  */

+#undef SLIST_HEAD

 #define	SLIST_HEAD(name, type)						\

 struct name {								\

 	struct type *slh_first;	/* first element */			\

@@ -159,6 +160,7 @@ struct name {								\

 #define	SLIST_HEAD_INITIALIZER(head)					\

 	{ NULL }

+#undef SLIST_ENTRY

 #define	SLIST_ENTRY(type)						\

 struct {								\

 	struct type *sle_next;	/* next element */			\

@@ -212,6 +214,7 @@ struct {								\

 #define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)

+#undef SLIST_REMOVE

 #define	SLIST_REMOVE(head, elm, type, field) do {			\

 	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\

 	if (SLIST_FIRST((head)) == (elm)) {				\

@@ -246,6 +249,7 @@ struct {								\

 /*

  * Singly-linked Tail queue declarations.

  */

+#undef STAILQ_HEAD

 #define	STAILQ_HEAD(name, type)						\

 struct name {								\

 	struct type *stqh_first;/* first element */			\

@@ -255,6 +259,7 @@ struct name {								\

 #define	STAILQ_HEAD_INITIALIZER(head)					\

 	{ NULL, &(head).stqh_first }

+#undef STAILQ_ENTRY

 #define	STAILQ_ENTRY(type)						\

 struct {								\

 	struct type *stqe_next;	/* next element */			\

@@ -318,12 +323,14 @@ struct {								\

 	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\

 } while (0)

+#undef STAILQ_LAST

 #define	STAILQ_LAST(head, type, field)					\

 	(STAILQ_EMPTY((head)) ? NULL :					\

 	    __containerof((head)->stqh_last, struct type, field.stqe_next))

 #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)

+#undef STAILQ_REMOVE

 #define	STAILQ_REMOVE(head, elm, type, field) do {			\

 	QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\

 	if (STAILQ_FIRST((head)) == (elm)) {				\

@@ -350,6 +357,7 @@ struct {								\

 		(head)->stqh_last = &STAILQ_FIRST((head));		\

 } while (0)

+#undef STAILQ_SWAP

 #define STAILQ_SWAP(head1, head2, type) do {				\

 	struct type *swap_first = STAILQ_FIRST(head1);			\

 	struct type **swap_last = (head1)->stqh_last;			\

@@ -367,6 +375,7 @@ struct {								\

 /*

  * List declarations.

  */

+#undef LIST_HEAD

 #define	LIST_HEAD(name, type)						\

 struct name {								\

 	struct type *lh_first;	/* first element */			\

@@ -375,6 +384,7 @@ struct name {								\

 #define	LIST_HEAD_INITIALIZER(head)					\

 	{ NULL }

+#undef LIST_ENTRY

 #define	LIST_ENTRY(type)						\

 struct {								\

 	struct type *le_next;	/* next element */			\

@@ -469,6 +479,7 @@ struct {								\

 	((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL :		\

 	    __containerof((elm)->field.le_prev, struct type, field.le_next))

+#undef LIST_REMOVE

 #define	LIST_REMOVE(elm, field) do {					\

 	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\

 	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\

@@ -482,6 +493,7 @@ struct {								\

 	TRASHIT(*oldprev);						\

 } while (0)

+#undef LIST_SWAP

 #define LIST_SWAP(head1, head2, type, field) do {			\

 	struct type *swap_tmp = LIST_FIRST((head1));			\

 	LIST_FIRST((head1)) = LIST_FIRST((head2));			\

@@ -495,6 +507,7 @@ struct {								\

 /*

  * Tail queue declarations.

  */

+#undef TAILQ_HEAD

 #define	TAILQ_HEAD(name, type)						\

 struct name {								\

 	struct type *tqh_first;	/* first element */			\

@@ -502,9 +515,11 @@ struct name {								\

 	TRACEBUF							\

 }

+#undef TAILQ_HEAD_INITIALIZER

 #define	TAILQ_HEAD_INITIALIZER(head)					\

 	{ NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }

+#undef TAILQ_ENTRY

 #define	TAILQ_ENTRY(type)						\

 struct {								\

 	struct type *tqe_next;	/* next element */			\

@@ -607,6 +622,7 @@ struct {								\

 	QMD_TRACE_HEAD(head);						\

 } while (0)

+#undef TAILQ_INSERT_AFTER

 #define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\

 	QMD_TAILQ_CHECK_NEXT(listelm, field);				\

 	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\

@@ -622,6 +638,7 @@ struct {								\

 	QMD_TRACE_ELEM(&listelm->field);				\

 } while (0)

+#undef TAILQ_INSERT_BEFORE

 #define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\

 	QMD_TAILQ_CHECK_PREV(listelm, field);				\

 	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\

@@ -632,6 +649,7 @@ struct {								\

 	QMD_TRACE_ELEM(&listelm->field);				\

 } while (0)

+#undef TAILQ_INSERT_HEAD

 #define	TAILQ_INSERT_HEAD(head, elm, field) do {			\

 	QMD_TAILQ_CHECK_HEAD(head, field);				\

 	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\

@@ -645,6 +663,7 @@ struct {								\

 	QMD_TRACE_ELEM(&(elm)->field);					\

 } while (0)

+#undef TAILQ_INSERT_TAIL

 #define	TAILQ_INSERT_TAIL(head, elm, field) do {			\

 	QMD_TAILQ_CHECK_TAIL(head, field);				\

 	TAILQ_NEXT((elm), field) = NULL;				\

@@ -655,14 +674,17 @@ struct {								\

 	QMD_TRACE_ELEM(&(elm)->field);					\

 } while (0)

+#undef TAILQ_LAST

 #define	TAILQ_LAST(head, headname)					\

 	(*(((struct headname *)((head)->tqh_last))->tqh_last))

 #define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)

+#undef TAILQ_PREV

 #define	TAILQ_PREV(elm, headname, field)				\

 	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))

+#undef TAILQ_REMOVE

 #define	TAILQ_REMOVE(head, elm, field) do {				\

 	QMD_SAVELINK(oldnext, (elm)->field.tqe_next);			\

 	QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);			\

@@ -681,6 +703,7 @@ struct {								\

 	QMD_TRACE_ELEM(&(elm)->field);					\

 } while (0)

+#undef TAILQ_SWAP

 #define TAILQ_SWAP(head1, head2, type, field) do {			\

 	struct type *swap_first = (head1)->tqh_first;			\

 	struct type **swap_last = (head1)->tqh_last;			\