Simplification of initial call to icu_iter_invoke
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 17 Jan 2013 11:58:43 +0000 (12:58 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 17 Jan 2013 11:58:43 +0000 (12:58 +0100)
src/icu_chain.c

index 9f05d23..586fb2d 100644 (file)
@@ -476,9 +476,8 @@ int icu_iter_next(yaz_icu_iter_t iter)
     else
     {
         /* on first call, iter->input is the input string. Thereafter: 0. */
     else
     {
         /* on first call, iter->input is the input string. Thereafter: 0. */
-        iter->last = icu_iter_invoke(iter, iter->steps ?
-                                     iter->steps : iter->chain->csteps,
-                                     iter->input);
+        assert(iter->steps || !iter->chain->csteps);
+        iter->last = icu_iter_invoke(iter, iter->steps, iter->input);
         iter->input = 0;
 
         if (!iter->last)
         iter->input = 0;
 
         if (!iter->last)