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

 /*

  * HWP Stuff

  * 

- * 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.

  * 

  * Authors: Kevin Lin

  * 

@@ -316,7 +316,7 @@ int cli_hwp5header(cli_ctx *ctx, hwp5_header_t *hwp5)

         }

         /* magic */

-        cli_jsonstr(header, "Magic", hwp5->signature);

+        cli_jsonstr(header, "Magic", (char*)hwp5->signature);

         /* version */

         cli_jsonint(header, "RawVersion", hwp5->version);

@@ -569,7 +569,7 @@ static inline int parsehwp3_docinfo(cli_ctx *ctx, off_t offset, struct hwp3_doci

         }

         /* Printed File Name */

-        str = convert_hstr_to_utf8(hwp3_ptr+DI_PNAME, 40, "HWP3.x", &iret);

+        str = convert_hstr_to_utf8((char*)(hwp3_ptr+DI_PNAME), 40, "HWP3.x", &iret);

         if (!str || (iret == CL_EMEM))

             return CL_EMEM;

@@ -581,7 +581,7 @@ static inline int parsehwp3_docinfo(cli_ctx *ctx, off_t offset, struct hwp3_doci

         free(str);

         /* Annotation */

-        str = convert_hstr_to_utf8(hwp3_ptr+DI_ANNOTE, 24, "HWP3.x", &iret);

+        str = convert_hstr_to_utf8((char*)(hwp3_ptr+DI_ANNOTE), 24, "HWP3.x", &iret);

         if (!str || (iret == CL_EMEM))

             return CL_EMEM;

@@ -620,7 +620,7 @@ static inline int parsehwp3_docsummary(cli_ctx *ctx, off_t offset)

     }

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

-        str = convert_hstr_to_utf8(hwp3_ptr+hwp3_docsummary_fields[i].offset, 112, "HWP3.x", &iret);

+        str = convert_hstr_to_utf8((char*)(hwp3_ptr + hwp3_docsummary_fields[i].offset), 112, "HWP3.x", &iret);

         if (!str || (iret == CL_EMEM))

             return CL_EMEM;

@@ -1843,10 +1843,10 @@ int cli_scanhwp3(cli_ctx *ctx)

 #if HAVE_JSON

     /*

-    /* magic *

+    // magic 

     cli_jsonstr(header, "Magic", hwp5->signature);

-    /* version *

+    // version

     cli_jsonint(header, "RawVersion", hwp5->version);

     */

 #endif

@@ -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-2008 Sourcefire, Inc.

  *

  *  Authors: Kevin Lin

@@ -170,7 +170,7 @@ typedef struct summary_ctx {

 /* string conversion */

 struct codepage_entry {

-    int16_t codepage;

+    uint16_t codepage;

     const char *encoding;

 };

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

 /*

  * Extract component parts of various MS XML files (e.g. MS Office 2003 XML 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

@@ -308,7 +308,7 @@ static int msxml_parse_element(struct msxml_ctx *mxctx, xmlTextReaderPtr reader,

                         value = xmlTextReaderConstValue(reader);

                         cli_msxmlmsg("\t%s: %s\n", name, value);

-                        cli_jsonstr(attributes, name, (const char *)value);

+                        cli_jsonstr(attributes, (char*)name, (const char *)value);

                     }

                 }

                 else if (state == -1)