From 2d4301f0bbe75c331f2c8b3f4f8936b1217b11c9 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 5 Sep 2016 22:36:45 -0500
Subject: [PATCH] Fix warnings from clang

---
 src/ioc/db/dbJLink.c   | 2 +-
 src/std/link/lnkCalc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ioc/db/dbJLink.c b/src/ioc/db/dbJLink.c
index 7e84bda2a..8b2778511 100644
--- a/src/ioc/db/dbJLink.c
+++ b/src/ioc/db/dbJLink.c
@@ -160,7 +160,7 @@ static int dbjl_string(void *ctx, const unsigned char *val, unsigned len) {
 static int dbjl_start_map(void *ctx) {
     parseContext *parser = (parseContext *) ctx;
     jlink *pjlink = parser->pjlink;
-    jlif_key_result result;
+    int result;
 
     if (!pjlink) {
         IFDEBUG(10) {
diff --git a/src/std/link/lnkCalc.c b/src/std/link/lnkCalc.c
index 7021e40b4..2acbe0666 100644
--- a/src/std/link/lnkCalc.c
+++ b/src/std/link/lnkCalc.c
@@ -227,10 +227,10 @@ static jlif_key_result lnkCalc_start_map(jlink *pjlink)
 
     if (clink->pstate != ps_init) {
         errlogPrintf("lnkCalc: Unexpected map\n");
-        return jlif_stop;
+        return jlif_key_stop;
     }
 
-    return jlif_continue;
+    return jlif_key_continue;
 }
 
 static jlif_result lnkCalc_map_key(jlink *pjlink, const char *key, size_t len)