From e7d186eaf85148343b2a22e251c0e416cffd680e Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Fri, 19 Sep 2014 13:09:52 +0200
Subject: [PATCH] ioc/db: use dbFindMenu() in callback.c

---
 src/ioc/db/callback.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/ioc/db/callback.c b/src/ioc/db/callback.c
index 574e05dd8..7a140c856 100644
--- a/src/ioc/db/callback.c
+++ b/src/ioc/db/callback.c
@@ -124,23 +124,19 @@ int callbackParallelThreads(int count, const char *prio)
             return -1;
         }
         /* Find prio in menuPriority */
-        pdbMenu = (dbMenu *)ellFirst(&pdbbase->menuList);
-        while (pdbMenu) {
-            gotMatch = (strcmp("menuPriority", pdbMenu->name)==0) ? TRUE : FALSE;
-            if (gotMatch) {
-                for (i = 0; i < pdbMenu->nChoice; i++) {
-                    gotMatch = (epicsStrCaseCmp(prio, pdbMenu->papChoiceValue[i])==0) ? TRUE : FALSE;
-                    if (gotMatch) break;
-                }
-                if (gotMatch) {
-                    callbackQueue[i].threadsConfigured = count;
-                    break;
-                } else {
-                    errlogPrintf("Unknown priority \"%s\"\n", prio);
-                    return -1;
-                }
+        pdbMenu = dbFindMenu(&pdbbase, "menuPriority");
+        if (pdbMenu) {
+            for (i = 0; i < pdbMenu->nChoice; i++) {
+                gotMatch = (epicsStrCaseCmp(prio, pdbMenu->papChoiceValue[i])==0) ? TRUE : FALSE;
+                if (gotMatch) break;
+            }
+            if (gotMatch) {
+                callbackQueue[i].threadsConfigured = count;
+                return 0;
+            } else {
+                errlogPrintf("Unknown priority \"%s\"\n", prio);
+                return -1;
             }
-            pdbMenu = (dbMenu *)ellNext(&pdbMenu->node);
         }
     }
     return 0;