Skip to content

Commit 53bac89

Browse files
schriblmarkus-metzger
authored andcommitted
libipt: fix compiler warnings
* addressing MSVC compiler warnings for boolean operations on different enum types without explicit cast * address Intel compiler warnings for using uninitialized vars used as const pointer argument for testing Signed-off-by: Thomas Bininda <[email protected]>
1 parent 294a0a2 commit 53bac89

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

libipt/src/pt_encoder.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ int pt_enc_next(struct pt_encoder *encoder, const struct pt_packet *packet)
695695
*pos++ = pt_opc_ext;
696696
*pos++ = pt_ext_cfe;
697697

698-
type = packet->payload.cfe.type & pt_pl_cfe_type;
698+
type = (uint8_t) packet->payload.cfe.type & (uint8_t) pt_pl_cfe_type;
699699
if (packet->payload.cfe.ip)
700700
type |= pt_pl_cfe_ip;
701701

@@ -714,7 +714,7 @@ int pt_enc_next(struct pt_encoder *encoder, const struct pt_packet *packet)
714714
*pos++ = pt_opc_ext;
715715
*pos++ = pt_ext_evd;
716716

717-
*pos++ = packet->payload.evd.type & pt_pl_evd_type;
717+
*pos++ = (uint8_t) packet->payload.evd.type & (uint8_t) pt_pl_evd_type;
718718
pos = pt_encode_int(pos, packet->payload.evd.payload,
719719
pt_pl_evd_pl_size);
720720

libipt/test/src/ptunit-block_decoder.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,8 @@ static struct ptunit_result asid_null(void)
278278
struct pt_asid asid;
279279
int errcode;
280280

281+
memset(&decoder, 0, sizeof(decoder));
282+
281283
errcode = pt_blk_asid(NULL, &asid, sizeof(asid));
282284
ptu_int_eq(errcode, -pte_invalid);
283285

libipt/test/src/ptunit-config.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,8 @@ static struct ptunit_result cpu_errata_null(void)
473473
struct pt_cpu cpu;
474474
int errcode;
475475

476+
memset(&cpu, 0, sizeof(cpu));
477+
476478
errcode = pt_cpu_errata(&errata, NULL);
477479
ptu_int_eq(errcode, -pte_invalid);
478480

libipt/test/src/ptunit-insn_decoder.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ static struct ptunit_result time_null(void)
248248
uint32_t lost_mtc, lost_cyc;
249249
int errcode;
250250

251+
memset(&decoder, 0, sizeof(decoder));
252+
251253
errcode = pt_insn_time(NULL, &time, &lost_mtc, &lost_cyc);
252254
ptu_int_eq(errcode, -pte_invalid);
253255

@@ -278,6 +280,8 @@ static struct ptunit_result asid_null(void)
278280
struct pt_asid asid;
279281
int errcode;
280282

283+
memset(&decoder, 0, sizeof(decoder));
284+
281285
errcode = pt_insn_asid(NULL, &asid, sizeof(asid));
282286
ptu_int_eq(errcode, -pte_invalid);
283287

0 commit comments

Comments
 (0)