Merge branch 'master' into longint

diff --combined client/client.c
index 0cf0cad,a58a7b3..732acfc
--- 1/client/client.c
--- 2/client/client.c
+++ b/client/client.c
@@@ -104,7 -104,7 +104,7 @@@ static int smallSetUpperBound = 0
  static int largeSetLowerBound = 1;
  static int mediumSetPresentNumber = 0;
  static Z_ElementSetNames *elementSetNames = 0;
 -static int setno = 1;                   /* current set offset */
 +static Odr_int setno = 1;                   /* current set offset */
  static enum oid_proto protocol = PROTO_Z3950;      /* current app protocol */
  #define RECORDSYNTAX_MAX 20
  static char *recordsyntax_list[RECORDSYNTAX_MAX];
@@@ -526,7 -526,7 +526,7 @@@ static void render_diag(Z_DiagnosticFor
          case Z_DiagnosticFormat_s_defaultDiagRec: {
              Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec;
              /* ### should check `dd->diagnosticSetId' */
 -            printf("code=%d (%s)", *dd->condition,
 +            printf("code=" ODR_INT_PRINTF " (%s)", *dd->condition,
                     diagbib1_str(*dd->condition));
              /* Both types of addinfo are the same, so use type-pun */
              if (dd->u.v2Addinfo != 0)
@@@ -760,7 -760,7 +760,7 @@@ int cmd_authentication(const char *arg
      }
      else if (r == 1)
      {
-         auth = nmem_malloc(nmem_auth, sizeof(*auth));
+         auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth));
          if (!strcmp(args[0], "-"))
          {
              auth->which = Z_IdAuthentication_anonymous;
@@@ -776,9 -776,10 +776,10 @@@
      }
      else if (r == 2)
      {
-         auth = nmem_malloc(nmem_auth, sizeof(*auth));
+         auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth));
          auth->which = Z_IdAuthentication_idPass;
-         auth->u.idPass = nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
+         auth->u.idPass = (Z_IdPass *)
+             nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
          auth->u.idPass->groupId = NULL;
          auth->u.idPass->userId = !strcmp(args[0], "-") ? 0 : args[0];
          auth->u.idPass->password = !strcmp(args[1], "-") ? 0 : args[1];
@@@ -787,9 -788,10 +788,10 @@@
      }
      else if (r == 3)
      {
-         auth = nmem_malloc(nmem_auth, sizeof(*auth));
+         auth = (Z_IdAuthentication*) nmem_malloc(nmem_auth, sizeof(*auth));
          auth->which = Z_IdAuthentication_idPass;
-         auth->u.idPass = nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
+         auth->u.idPass = (Z_IdPass *)
+             nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
          auth->u.idPass->groupId = args[1];
          auth->u.idPass->userId = args[0];
          auth->u.idPass->password = args[2];
@@@ -1121,8 -1123,7 +1123,8 @@@ static void display_diagrecs(Z_DiagRec 
              if (oid_oidcmp(r->diagnosticSetId, yaz_oid_diagset_bib_1))
                  printf("Unknown diagset: %s\n", diag_name);
          }
 -        printf("    [%d] %s", *r->condition, diagbib1_str(*r->condition));
 +        printf("    [" ODR_INT_PRINTF "] %s",
 +               *r->condition, diagbib1_str(*r->condition));
          switch (r->which)
          {
          case Z_DefaultDiagFormat_v2Addinfo:
@@@ -1183,7 -1184,8 +1185,7 @@@ static int send_deleteResultSetRequest(
                 names[0], names[1], names[2], names[3],
                 names[4], names[5], names[6], names[7]);
  
 -    req->deleteFunction = (int *)
 -        odr_malloc(out, sizeof(*req->deleteFunction));
 +    req->deleteFunction = odr_intdup(out, 0);
      if (req->num_resultSetList > 0)
      {
          *req->deleteFunction = Z_DeleteResultSetRequest_list;
@@@ -1542,7 -1544,7 +1544,7 @@@ static void display_queryExpression(con
                  printf("%s", term->u.characterString);
                  break;
              case Z_Term_numeric:
 -                printf("%d", *term->u.numeric);
 +                printf(ODR_INT_PRINTF, *term->u.numeric);
                  break;
              case Z_Term_null:
                  printf("null");
@@@ -1582,8 -1584,7 +1584,8 @@@ static void display_searchResult(Z_Othe
                      display_queryExpression("recommendation",
                          sr->elements[j]->subqueryRecommendation);
                      if (sr->elements[j]->subqueryCount)
 -                        printf(" cnt=%d", *sr->elements[j]->subqueryCount);
 +                        printf(" cnt=" ODR_INT_PRINTF,
 +                               *sr->elements[j]->subqueryCount);
                      if (sr->elements[j]->subqueryId)
                          printf(" id=%s ", sr->elements[j]->subqueryId);
                  }
@@@ -1601,7 -1602,7 +1603,7 @@@ static int process_searchResponse(Z_Sea
          printf("Search was a success.\n");
      else
          printf("Search was a bloomin' failure.\n");
 -    printf("Number of hits: %d", *res->resultCount);
 +    printf("Number of hits: " ODR_INT_PRINTF, *res->resultCount);
      last_hit_count = *res->resultCount;
      if (setnumber >= 0)
          printf(", setno %d", setnumber);
@@@ -1620,12 -1621,12 +1622,12 @@@
          case Z_SearchResponse_estimate:
              printf("estimate"); break;
          default:
 -            printf("%d", *res->resultSetStatus);
 +            printf(ODR_INT_PRINTF, *res->resultSetStatus);
          }
          putchar('\n');
      }
      display_searchResult(res->additionalSearchInfo);
 -    printf("records returned: %d\n",
 +    printf("records returned: " ODR_INT_PRINTF "\n",
             *res->numberOfRecordsReturned);
      setno += *res->numberOfRecordsReturned;
      if (res->records)
@@@ -1640,16 -1641,7 +1642,16 @@@ static void print_level(int iLevel
          printf(" ");
  }
  
 -static void print_int(int iLevel, const char *pTag, int *pInt)
 +static void print_int(int iLevel, const char *pTag, Odr_int *pInt)
 +{
 +    if (pInt != NULL)
 +    {
 +        print_level(iLevel);
 +        printf("%s: " ODR_INT_PRINTF "\n", pTag, *pInt);
 +    }
 +}
 +
 +static void print_bool(int iLevel, const char *pTag, Odr_bool *pInt)
  {
      if (pInt != NULL)
      {
@@@ -1802,10 -1794,10 +1804,10 @@@ static int process_resourceControlReque
  {
      printf("Received ResourceControlRequest.\n");
      print_referenceId(1, req->referenceId);
 -    print_int(1, "Suspended Flag", req->suspendedFlag);
 +    print_bool(1, "Suspended Flag", req->suspendedFlag);
      print_int(1, "Partial Results Available", req->partialResultsAvailable);
 -    print_int(1, "Response Required", req->responseRequired);
 -    print_int(1, "Triggered Request Flag", req->triggeredRequestFlag);
 +    print_bool(1, "Response Required", req->responseRequired);
 +    print_bool(1, "Triggered Request Flag", req->triggeredRequestFlag);
      print_external(1, req->resourceReport);
      return 0;
  }
@@@ -2054,7 -2046,9 +2056,7 @@@ static Z_External *create_ItemOrderExte
      r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1";
  
      r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item =
 -        (int *) odr_malloc(out, sizeof(int));
 -    *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
 -
 +        odr_intdup(out, itemno);
      if (!strcmp (type, "item") || !strcmp(type, "2"))
      {
          printf("using item-request\n");
@@@ -2291,7 -2285,8 +2293,7 @@@ static int cmd_update_Z3950(int version
          }
          toKeep->elementSetName = 0;
  
 -        toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
 -        *toKeep->action = action_no;
 +        toKeep->action = odr_intdup(out, action_no);
  
          notToKeep = r->u.update0->u.esRequest->notToKeep = (Z_IU0SuppliedRecords *)
              odr_malloc(out, sizeof(*r->u.update0->u.esRequest->notToKeep));
@@@ -2338,7 -2333,8 +2340,7 @@@
          }
          toKeep->elementSetName = 0;
          toKeep->actionQualifier = 0;
 -        toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
 -        *toKeep->action = action_no;
 +        toKeep->action = odr_intdup(out, action_no);
  
          notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
              odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
@@@ -2659,7 -2655,7 +2661,7 @@@ static int cmd_setnames(const char *arg
  /* PRESENT SERVICE ----------------------------- */
  
  static void parse_show_args(const char *arg_c, char *setstring,
 -                            int *start, int *number)
 +                            Odr_int *start, Odr_int *number)
  {
      char arg[40];
      char *p;
@@@ -2695,7 -2691,7 +2697,7 @@@ static int send_presentRequest(const ch
      Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
      Z_PresentRequest *req = apdu->u.presentRequest;
      Z_RecordComposition compo;
 -    int nos = 1;
 +    Odr_int nos = 1;
      char setstring[100];
  
      req->referenceId = set_refid(out);
@@@ -2777,8 -2773,7 +2779,8 @@@
          compo.u.simple = elementSetNames;
      }
      send_apdu(apdu);
 -    printf("Sent presentRequest (%d+%d).\n", setno, nos);
 +    printf("Sent presentRequest (" ODR_INT_PRINTF "+" ODR_INT_PRINTF ").\n",
 +           setno, nos);
      return 2;
  }
  
@@@ -2786,7 -2781,7 +2788,7 @@@
  static int send_SRW_presentRequest(const char *arg)
  {
      char setstring[100];
 -    int nos = 1;
 +    Odr_int nos = 1;
      Z_SRW_PDU *sr = srw_sr;
  
      if (!sr)
@@@ -2932,7 -2927,7 +2934,7 @@@ int cmd_cancel_find(const char *arg) 
  }
  
  int send_scanrequest(const char *set,  const char *query,
 -                     int pp, int num, const char *term)
 +                     Odr_int pp, Odr_int num, const char *term)
  {
      Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
      Z_ScanRequest *req = apdu->u.scanRequest;
@@@ -3068,7 -3063,7 +3070,7 @@@ void display_term(Z_TermInfo *t
              t->term->u.general->buf);
  
      if (t->globalOccurrences)
 -        printf(" (%d)\n", *t->globalOccurrences);
 +        printf(" (" ODR_INT_PRINTF ")\n", *t->globalOccurrences);
      else
          printf("\n");
  }
@@@ -3081,12 -3076,12 +3083,12 @@@ void process_scanResponse(Z_ScanRespons
  
      printf("Received ScanResponse\n");
      print_refid(res->referenceId);
 -    printf("%d entries", *res->numberOfEntriesReturned);
 +    printf(ODR_INT_PRINTF " entries", *res->numberOfEntriesReturned);
      if (res->positionOfTerm)
 -        printf(", position=%d", *res->positionOfTerm);
 +        printf(", position=" ODR_INT_PRINTF, *res->positionOfTerm);
      printf("\n");
      if (*res->scanStatus != Z_Scan_success)
 -        printf("Scan returned code %d\n", *res->scanStatus);
 +        printf("Scan returned code " ODR_INT_PRINTF "\n", *res->scanStatus);
      if (!res->entries)
          return;
      if ((entries = res->entries->entries))
@@@ -3119,7 -3114,7 +3121,7 @@@ void process_sortResponse(Z_SortRespons
      case Z_SortResponse_failure:
          printf("failure"); break;
      default:
 -        printf("unknown (%d)", *res->sortStatus);
 +        printf("unknown (" ODR_INT_PRINTF ")", *res->sortStatus);
      }
      printf("\n");
      print_refid (res->referenceId);
@@@ -3130,16 -3125,15 +3132,16 @@@
  
  void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
  {
 -    printf("Got deleteResultSetResponse status=%d\n",
 +    printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n",
             *res->deleteOperationStatus);
      if (res->deleteListStatuses)
      {
          int i;
          for (i = 0; i < res->deleteListStatuses->num; i++)
          {
 -            printf("%s status=%d\n", res->deleteListStatuses->elements[i]->id,
 -                    *res->deleteListStatuses->elements[i]->status);
 +            printf("%s status=" ODR_INT_PRINTF "\n",
 +                   res->deleteListStatuses->elements[i]->id,
 +                   *res->deleteListStatuses->elements[i]->status);
          }
      }
  }
@@@ -3914,7 -3908,7 +3916,7 @@@ static void handle_srw_record(Z_SRW_rec
  {
      if (rec->recordPosition)
      {
 -        printf("pos=%d", *rec->recordPosition);
 +        printf("pos=" ODR_INT_PRINTF, *rec->recordPosition);
          setno = *rec->recordPosition + 1;
      }
      if (rec->recordSchema)
@@@ -3954,7 -3948,7 +3956,7 @@@ static void handle_srw_response(Z_SRW_s
              printf("Details: %s\n", res->diagnostics[i].details);
      }
      if (res->numberOfRecords)
 -        printf("Number of hits: %d\n", *res->numberOfRecords);
 +        printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
      for (i = 0; i<res->num_records; i++)
          handle_srw_record(res->records + i);
  }
@@@ -3968,7 -3962,7 +3970,7 @@@ static void handle_srw_scan_term(Z_SRW_
      else
          printf("No value:");
      if (term->numberOfRecords)
 -        printf(" %d", *term->numberOfRecords);
 +        printf(" " ODR_INT_PRINTF, *term->numberOfRecords);
      if (term->whereInList)
          printf(" %s", term->whereInList);
      if (term->value && term->displayTerm)
@@@ -4184,7 -4178,7 +4186,7 @@@ static void wait_and_handle_response(in
                      display_records(apdu->u.presentResponse->records);
                  else
                      printf("No records.\n");
 -                printf("nextResultSetPosition = %d\n",
 +                printf("nextResultSetPosition = " ODR_INT_PRINTF "\n",
                          *apdu->u.presentResponse->nextResultSetPosition);
                  break;
              case Z_APDU_sortResponse: