Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra

[idzebra-moved-to-github.git] / index / zebraapi.c

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 7e2382d..2b69a2d 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -69,7 +69,7 @@ static int zebra_chdir(ZebraService zs)
     yaz_log(log_level, "zebra_chdir");
     dir = res_get(zs->global_res, "chdir");
     if (!dir)
-       return;
+       return 0;
     yaz_log(YLOG_DEBUG, "chdir %s", dir);
 #ifdef WIN32
     r = _chdir(dir);
@@ -1634,7 +1634,7 @@ static void zebra_get_state(ZebraHandle zh, char *val, int *seqno)
 
     if (f)
     {
-        if (fscanf(f, "%c %d", val, seqno))
+        if (fscanf(f, "%c %d", val, seqno) != 2)
         {
             yaz_log(YLOG_ERRNO|YLOG_WARN, "fscan fail %s",
                     state_fname);