- if (!src8cstr)
- return 0;
- else
- {
- struct icu_iter *iter = xmalloc(sizeof(*iter));
- iter->chain = chain;
- iter->status = U_ZERO_ERROR;
- iter->display = icu_buf_utf8_create(0);
- iter->sort8 = icu_buf_utf8_create(0);
- iter->token_count = 0;
- iter->last = 0; /* no last returned string (yet) */
-#if 0
- iter->steps = icu_chain_step_clone(chain->csteps);
-#else
- iter->steps = 0;
-#endif
+ yaz_icu_iter_t iter = xmalloc(sizeof(*iter));
+ iter->chain = chain;
+ iter->status = U_ZERO_ERROR;
+ iter->display = icu_buf_utf8_create(0);
+ iter->sort8 = icu_buf_utf8_create(0);
+ iter->result = icu_buf_utf8_create(0);
+ iter->last = 0; /* no last returned string (yet) */
+ iter->steps = icu_chain_step_clone(chain->csteps);
+ iter->input = 0;
+
+ return iter;
+}