X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=b478ce28d33617208f5c8e68236a9c9f50c26b61;hb=56f715bb23c31ea1f8a551e7f1f9b58a10bafbad;hp=782921c46364af9d7c9cc20193acf883172e48f6;hpb=e15cbdedce45f8d4ce7642182899919cf9266984;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 782921c..b478ce2 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: client.c,v 1.299 2005-11-02 11:54:40 adam Exp $ + * $Id: client.c,v 1.302 2005-12-20 23:07:27 adam Exp $ */ #include @@ -1530,7 +1530,7 @@ static int send_searchRequest(const char *arg) if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 && mediumSetPresentNumber > 0)) { - if (recordsyntax_list > 0) + if (recordsyntax_size > 0) req->preferredRecordSyntax = yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax_list[0]); req->smallSetElementSetNames = @@ -3250,8 +3250,8 @@ int cmd_packagename(const char* arg) int cmd_proxy(const char* arg) { - xfree (yazProxy); - yazProxy = NULL; + xfree(yazProxy); + yazProxy = 0; if (*arg) yazProxy = xstrdup (arg); return 1; @@ -4093,6 +4093,7 @@ int cmd_set_otherinfo(const char* args) extraOtherInfos[otherinfoNo].oidval = -1; if (extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = 0; return 0; } if (sscan_res<3) { @@ -4295,7 +4296,6 @@ static struct { } cmd_array[] = { {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, {"quit", cmd_quit, "",NULL,0,NULL}, - {"exit", cmd_quit, "",NULL,0,NULL}, {"find", cmd_find, "",NULL,0,NULL}, {"delete", cmd_delete, "",NULL,0,NULL}, {"base", cmd_base, "",NULL,0,NULL}, @@ -4366,6 +4366,7 @@ static struct { {"zversion", cmd_zversion, "", NULL, 0, NULL}, {"help", cmd_help, "", NULL,0,NULL}, {"init", cmd_init, "", NULL,0,NULL}, + {"exit", cmd_quit, "",NULL,0,NULL}, {0,0,0,0,0,0} }; @@ -4749,7 +4750,7 @@ int main(int argc, char **argv) hex_dump = 1; break; case 'p': - yazProxy=strdup(arg); + yazProxy = xstrdup(arg); break; case 'u': if (!auth_command)