From 9a83c08e1f5eca156f911f71189590b2d436a723 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 6 Nov 2013 15:57:18 +0100 Subject: [PATCH 1/1] yaz-client: lslb, ssub, mspn are Odr_ints now YAZ-705 --- client/client.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/client/client.c b/client/client.c index b404ae2..8385a5b 100644 --- a/client/client.c +++ b/client/client.c @@ -103,9 +103,9 @@ char *databaseNames[128]; int num_databaseNames = 0; static Z_External *record_last = 0; static int setnumber = -1; /* current result set number */ -static int smallSetUpperBound = 0; -static int largeSetLowerBound = 1; -static int mediumSetPresentNumber = 0; +static Odr_int smallSetUpperBound = 0; +static Odr_int largeSetLowerBound = 1; +static Odr_int mediumSetPresentNumber = 0; static Z_ElementSetNames *elementSetNames = 0; static Z_FacetList *facet_list = 0; static ODR facet_odr = 0; @@ -2949,30 +2949,30 @@ static int cmd_delete(const char *arg) static int cmd_ssub(const char *arg) { - if (!(smallSetUpperBound = atoi(arg))) - return 0; + smallSetUpperBound = odr_strtol(arg, 0, 10); return 1; } static int cmd_lslb(const char *arg) { - if (!(largeSetLowerBound = atoi(arg))) - return 0; + largeSetLowerBound = odr_strtol(arg, 0, 10); return 1; } static int cmd_mspn(const char *arg) { - if (!(mediumSetPresentNumber = atoi(arg))) - return 0; + mediumSetPresentNumber = odr_strtol(arg, 0, 10); return 1; } static int cmd_status(const char *arg) { - printf("smallSetUpperBound: %d\n", smallSetUpperBound); - printf("largeSetLowerBound: %d\n", largeSetLowerBound); - printf("mediumSetPresentNumber: %d\n", mediumSetPresentNumber); + printf("smallSetUpperBound: " ODR_INT_PRINTF "\n", + smallSetUpperBound); + printf("largeSetLowerBound: " ODR_INT_PRINTF "\n", + largeSetLowerBound); + printf("mediumSetPresentNumber: " ODR_INT_PRINTF "\n", + mediumSetPresentNumber); return 1; } @@ -4897,7 +4897,9 @@ static int cmd_list_all(const char* args) printf("Named Result Sets : %s\n",setnumber==-1?"off":"on"); /* piggy back options */ - printf("ssub/lslb/mspn : %d/%d/%d\n",smallSetUpperBound,largeSetLowerBound,mediumSetPresentNumber); + printf("ssub/lslb/mspn : " ODR_INT_PRINTF "/" ODR_INT_PRINTF "/" + ODR_INT_PRINTF "\n", + smallSetUpperBound, largeSetLowerBound, mediumSetPresentNumber); /* print present related options */ if (recordsyntax_size > 0) -- 1.7.10.4