X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=a9a3cbac1c4aade9c92fdbf3e7e83d221de5fa17;hb=a7585fd1220c684189091e7fba2c5d6cf436031e;hp=898af566bae031ae459fb8167a12c4a8531a6196;hpb=69b1d8e7b437179163fe97b7cbead51a56835f2a;p=yaz-moved-to-github.git diff --git a/src/seshigh.c b/src/seshigh.c index 898af56..a9a3cba 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -3098,7 +3098,6 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) { Z_Entry *e; Z_TermInfo *t; - Odr_oct *o; tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e)); if (bsrr->entries[i].occurrences >= 0) @@ -3125,15 +3124,10 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) t->term = (Z_Term *) odr_malloc(assoc->encode, sizeof(*t->term)); t->term->which = Z_Term_general; - t->term->u.general = o = - (Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct)); - o->buf = (char *) - odr_malloc(assoc->encode, o->len = - strlen(bsrr->entries[i].term)); -#if OCT_SIZE - o->size = o->len; -#endif - memcpy(o->buf, bsrr->entries[i].term, o->len); + t->term->u.general = + odr_create_Odr_oct(assoc->encode, + bsrr->entries[i].term, + strlen(bsrr->entries[i].term)); yaz_log(YLOG_DEBUG, " term #%d: '%s' (" ODR_INT_PRINTF ")", i, bsrr->entries[i].term, bsrr->entries[i].occurrences); }