From c0a7ab976c49e39f35919f639082ab00a49728c8 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 4 Jun 2018 15:27:01 -0500 Subject: [PATCH] Fix warnings from clang --- src/std/link/lnkDebug.c | 2 +- src/std/link/test/lnkCalcTest.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/std/link/lnkDebug.c b/src/std/link/lnkDebug.c index 3238a0b62..bd8f84e5a 100644 --- a/src/std/link/lnkDebug.c +++ b/src/std/link/lnkDebug.c @@ -882,7 +882,7 @@ static jlif_key_result lnkDebug_start_map(jlink *pjlink) case DBF_FWDLINK: return jlif_key_child_outlink; } - return jlif_stop; + return jlif_key_stop; } static jlif_result lnkDebug_end_map(jlink *pjlink) diff --git a/src/std/link/test/lnkCalcTest.c b/src/std/link/test/lnkCalcTest.c index c0d76dda3..3fe8382d4 100644 --- a/src/std/link/test/lnkCalcTest.c +++ b/src/std/link/test/lnkCalcTest.c @@ -91,7 +91,7 @@ static void testCalc() status = dbGetLink(pinp, DBF_DOUBLE, &f64, NULL, NULL); testOk(!status, "dbGetLink succeeded (status = %ld)", status); testOk(f64 == 0.0, "Got zero (%g)", f64); - testOk(recGblResetAlarms(pio) && DBE_ALARM, "Record alarm was raised"); + testOk(recGblResetAlarms(pio) & DBE_ALARM, "Record alarm was raised"); status = dbGetAlarm(pinp, &stat, &sevr); testOk(!status, "dbGetAlarm succeeded (status = %ld)", status); testOk(stat == LINK_ALARM, "Alarm status = LINK (%d)", stat); @@ -100,7 +100,7 @@ static void testCalc() dbStateClear(major); status = dbGetLink(pinp, DBF_DOUBLE, &f64, NULL, NULL); testOk(!status, "dbGetLink succeeded (status = %ld)", status); - testOk(recGblResetAlarms(pio) && DBE_ALARM, "Record alarm was raised"); + testOk(recGblResetAlarms(pio) & DBE_ALARM, "Record alarm was raised"); status = dbGetAlarm(pinp, &stat, &sevr); testOk(!status, "dbGetAlarm succeeded (status = %ld)", status); testOk(stat == LINK_ALARM, "Alarm status = LINK (%d)", stat);