@@ -49,7 +49,7 @@

 #  define apm_parsemsg(...) ;

 #endif

-static int apm_prtn_intxn(cli_ctx *ctx, struct apm_partition_info aptable, size_t sectorsize, int old_school);

+static int apm_prtn_intxn(cli_ctx *ctx, struct apm_partition_info *aptable, size_t sectorsize, int old_school);

 int cli_scanapm(cli_ctx *ctx)

 {

@@ -89,8 +89,8 @@ int cli_scanapm(cli_ctx *ctx)

     /* size of total file must be described by the ddm */

     maplen = (*ctx->fmap)->real_len;

     if ((ddm.blockSize * ddm.blockCount) != maplen) {

-        cli_dbgmsg("cli_scanapm: File described %u size does not match %u actual size\n",

-                   (ddm.blockSize * ddm.blockCount), maplen);

+        cli_dbgmsg("cli_scanapm: File described %u size does not match %lu actual size\n",

+                   (ddm.blockSize * ddm.blockCount), (unsigned long)maplen);

         return CL_EFORMAT;

     }

@@ -138,7 +138,7 @@ int cli_scanapm(cli_ctx *ctx)

     /* check that the partition table fits in the space specified - HEURISTICS */

     if ((ctx->options & CL_SCAN_PARTITION_INTXN) && (ctx->dconf->other & OTHER_CONF_PRTNINTXN)) {

-        ret = apm_prtn_intxn(ctx, aptable, sectorsize, old_school);

+        ret = apm_prtn_intxn(ctx, &aptable, sectorsize, old_school);

         if (ret != CL_CLEAN) {

             if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

                 detection = CL_VIRUS;

@@ -153,10 +153,10 @@ int cli_scanapm(cli_ctx *ctx)

     cli_dbgmsg("Type: %s\n", (char*)aptable.type);

     cli_dbgmsg("Signature: %x\n", aptable.signature);

     cli_dbgmsg("Partition Count: %u\n", aptable.numPartitions);

-    cli_dbgmsg("Blocks: [%u, +%u), ([%u, +%u))\n",

+    cli_dbgmsg("Blocks: [%u, +%u), ([%lu, +%lu))\n",

                aptable.pBlockStart, aptable.pBlockCount,

-               (aptable.pBlockStart * sectorsize),

-               (aptable.pBlockCount * sectorsize));

+               (unsigned long)(aptable.pBlockStart * sectorsize),

+               (unsigned long)(aptable.pBlockCount * sectorsize));

     /* check engine maxpartitions limit */

     if (aptable.numPartitions < ctx->engine->maxpartitions) {

@@ -244,7 +244,7 @@ int cli_scanapm(cli_ctx *ctx)

     return detection;

 }

-static int apm_prtn_intxn(cli_ctx *ctx, struct apm_partition_info aptable, size_t sectorsize, int old_school)

+static int apm_prtn_intxn(cli_ctx *ctx, struct apm_partition_info *aptable, size_t sectorsize, int old_school)

 {

     prtn_intxn_list_t prtncheck;

     struct apm_partition_info apentry;

@@ -256,8 +256,8 @@ static int apm_prtn_intxn(cli_ctx *ctx, struct apm_partition_info aptable, size_

     prtn_intxn_list_init(&prtncheck);

     /* check engine maxpartitions limit */

-    if (aptable.numPartitions < ctx->engine->maxpartitions) {

-        max_prtns = aptable.numPartitions;

+    if (aptable->numPartitions < ctx->engine->maxpartitions) {

+        max_prtns = aptable->numPartitions;

     }

     else {

         max_prtns = ctx->engine->maxpartitions;

@@ -121,7 +121,7 @@ int cli_scangpt(cli_ctx *ctx, size_t sectorsize)

     /* sector size calculatation */

     if (sectorsize == 0) {

         sectorsize = gpt_detect_size((*ctx->fmap));

-        cli_dbgmsg("cli_scangpt: detected %u sector size\n", sectorsize);

+        cli_dbgmsg("cli_scangpt: detected %lu sector size\n", (unsigned long)sectorsize);

     }

     if (sectorsize == 0) {

         cli_errmsg("cli_scangpt: could not detemine sector size\n");

@@ -131,8 +131,8 @@ int cli_scangpt(cli_ctx *ctx, size_t sectorsize)

     /* size of total file must be a multiple of the sector size */

     maplen = (*ctx->fmap)->real_len;

     if ((maplen % sectorsize) != 0) {

-        cli_dbgmsg("cli_scangpt: File sized %u is not a multiple of sector size %u\n",

-                   maplen, sectorsize);

+        cli_dbgmsg("cli_scangpt: File sized %lu is not a multiple of sector size %lu\n",

+                   (unsigned long)maplen, (unsigned long)sectorsize);

         return CL_EFORMAT;

     }

@@ -114,8 +114,8 @@ int cli_mbr_check2(cli_ctx *ctx, size_t sectorsize) {

     /* size of total file must be a multiple of the sector size */

     maplen = (*ctx->fmap)->real_len;

     if ((maplen % sectorsize) != 0) {

-        cli_dbgmsg("cli_scanmbr: File sized %u is not a multiple of sector size %u\n",

-                   maplen, sectorsize);

+        cli_dbgmsg("cli_scanmbr: File sized %lu is not a multiple of sector size %lu\n",

+                   (unsigned long)maplen, (unsigned long)sectorsize);

         return CL_EFORMAT;

     }

@@ -160,8 +160,8 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

     /* size of total file must be a multiple of the sector size */

     maplen = (*ctx->fmap)->real_len;

     if ((maplen % sectorsize) != 0) {

-        cli_dbgmsg("cli_scanmbr: File sized %u is not a multiple of sector size %u\n",

-                   maplen, sectorsize);

+        cli_dbgmsg("cli_scanmbr: File sized %lu is not a multiple of sector size %lu\n",

+                   (unsigned long)maplen, (unsigned long)sectorsize);

         return CL_EFORMAT;

     }

@@ -210,10 +210,10 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

         cli_dbgmsg("MBR Partition Entry %u:\n", i);

         cli_dbgmsg("Status: %u\n", mbr.entries[i].status);

         cli_dbgmsg("Type: %x\n", mbr.entries[i].type);

-        cli_dbgmsg("Blocks: [%u, +%u), ([%u, +%u))\n",

+        cli_dbgmsg("Blocks: [%u, +%u), ([%lu, +%lu))\n",

                    mbr.entries[i].firstLBA, mbr.entries[i].numLBA,

-                   (mbr.entries[i].firstLBA * sectorsize),

-                   (mbr.entries[i].numLBA * sectorsize));

+                   (unsigned long)(mbr.entries[i].firstLBA * sectorsize),

+                   (unsigned long)(mbr.entries[i].numLBA * sectorsize));

         /* Handle MBR entry based on type */

         if (mbr.entries[i].type == MBR_EMPTY) {

@@ -306,10 +306,10 @@ static int mbr_scanextprtn(cli_ctx *ctx, unsigned *prtncount, off_t extlba, size

                 cli_dbgmsg("Logical Partition Entry %u:\n", j);

                 cli_dbgmsg("Status: %u\n", ebr.entries[j].status);

                 cli_dbgmsg("Type: %x\n", ebr.entries[j].type);

-                cli_dbgmsg("Blocks: [%u, +%u), ([%u, +%u))\n",

+                cli_dbgmsg("Blocks: [%u, +%u), ([%lu, +%lu))\n",

                            ebr.entries[j].firstLBA, ebr.entries[j].numLBA,

-                           (ebr.entries[j].firstLBA * sectorsize),

-                           (ebr.entries[j].numLBA * sectorsize));

+                           (unsigned long)(ebr.entries[j].firstLBA * sectorsize),

+                           (unsigned long)(ebr.entries[j].numLBA * sectorsize));

                 if (ebr.entries[j].type == MBR_EMPTY) {

                     /* empty partiton entry */