@@ -216,7 +216,7 @@ static void print_platform(struct cli_environment *env)

 {

     printf("\nPlatform information\n--------------------\n");

     printf("uname: %s %s %s %s\n",

-	   env->sysname, env->release, env->release, env->version, env->machine);

+	   env->sysname, env->release, env->version, env->machine);

     printf("OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE"\n");

@@ -248,8 +248,8 @@ static void print_platform(struct cli_environment *env)

 #endif

     if (env->triple[0])

     printf("Triple: %s\n", env->triple);

-    if (env->cpu[0]);

-    printf("CPU: %s, %s\n", env->cpu, env->big_endian ? "Big-endian" : "Little-endian");

+    if (env->cpu[0])

+	printf("CPU: %s, %s\n", env->cpu, env->big_endian ? "Big-endian" : "Little-endian");

     printf("platform id: 0x%08x%08x%08x\n",

 	   env->platform_id_a,

 	   env->platform_id_b,

@@ -32,6 +32,7 @@

 #include "pe.h"

 #include "bytecode.h"

 #include "bytecode_priv.h"

+#include "bytecode_detect.h"

 #include "readdb.h"

 #include "scanners.h"

 #include "bytecode_api.h"

@@ -1722,7 +1723,7 @@ static int calc_gepz(struct cli_bc *bc, struct cli_bc_func *func, uint16_t tid,

 	return 0;

     gepoff = &func->constants[op - func->numValues];

     if (*gepoff >= ty->numElements) {

-	cli_errmsg("bytecode: gep offset out of range: %d >= %d\n",*gepoff, ty->numElements);

+	cli_errmsg("bytecode: gep offset out of range: %d >= %d\n",(uint32_t)*gepoff, ty->numElements);

 	return -1;

     }

     for (i=0;i<*gepoff;i++) {

@@ -2540,7 +2541,7 @@ void cli_bytecode_describe(const struct cli_bc *bc)

     printf("Bytecode metadata:\n\tcompiler version: %s\n",

 	   bc->metadata.compiler ? bc->metadata.compiler : "N/A");

     printf("\tcompiled on: (%d) %s",

-	   stamp,

+	   (uint32_t)stamp,

 	   cli_ctime(&stamp, buf, sizeof(buf)));

     printf("\tcompiled by: %s\n", bc->metadata.sigmaker ? bc->metadata.sigmaker : "N/A");

     /*TODO: parse and display arch name, also take it into account when

@@ -1219,7 +1219,7 @@ int32_t cli_bcapi_input_switch(struct cli_bc_ctx *ctx , int32_t extracted_file)

 uint32_t cli_bcapi_get_environment(struct cli_bc_ctx *ctx , struct cli_environment* env, uint32_t len)

 {

     if (len > sizeof(*env)) {

-	cli_dbgmsg("cli_bcapi_get_environment len %d > %d\n", len, sizeof(*env));

+	cli_dbgmsg("cli_bcapi_get_environment len %u > %lu\n", len, sizeof(*env));

 	return -1;

     }

     memcpy(env, ctx->env, len);

@@ -152,5 +152,5 @@ struct cli_environment {

 #endif

 void cli_detect_env_jit(struct cli_environment *env);

-void cli_detect_env(struct cli_environment *env);

+void cli_detect_environment(struct cli_environment *env);

 #endif

@@ -1504,10 +1504,10 @@ static int cli_loadcbc(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 			struct cli_bc *bc0 = &bcs->all_bcs[i];

 			cli_errmsg("Can only load 1 BC_STARTUP bytecode, attempted to load 2nd!\n");

 			cli_warnmsg("Previous BC_STARTUP: %d %d by %s\n",

-				    bc0->id, bc0->metadata.timestamp,

+				    bc0->id, (uint32_t)bc0->metadata.timestamp,

 				    bc0->metadata.sigmaker ? bc0->metadata.sigmaker : "N/A");

 			cli_warnmsg("Conflicting BC_STARTUP: %d %d by %s\n",

-				    bc->id, bc->metadata.timestamp,

+				    bc->id, (uint32_t)bc->metadata.timestamp,

 				    bc->metadata.sigmaker ? bc->metadata.sigmaker : "N/A");

 			return CL_EMALFDB;

 		    }