Fix crash in record conv rule select YAZ-812

[yaz-moved-to-github.git] / src / zget.c

diff --git a/src/zget.c b/src/zget.c
index 7044168..7b11217 100644 (file)
--- a/src/zget.c
+++ b/src/zget.c
@@ -1,16 +1,19 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
  * \file zget.c
  * \brief Implements Z39.50 package creator utilities
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <yaz/proto.h>
 #include <yaz/oid_db.h>
 
-Z_InitRequest *zget_InitRequest(ODR o)
+static Z_InitRequest *zget_InitRequest(ODR o)
 {
     Z_InitRequest *r = (Z_InitRequest *)odr_malloc(o, sizeof(*r));
 
@@ -43,7 +46,7 @@ Z_InitRequest *zget_InitRequest(ODR o)
     return r;
 }
 
-Z_InitResponse *zget_InitResponse(ODR o)
+static Z_InitResponse *zget_InitResponse(ODR o)
 {
     Z_InitResponse *r = (Z_InitResponse *)odr_malloc(o, sizeof(*r));
 
@@ -67,7 +70,7 @@ Z_InitResponse *zget_InitResponse(ODR o)
     return r;
 }
 
-Z_SearchRequest *zget_SearchRequest(ODR o)
+static Z_SearchRequest *zget_SearchRequest(ODR o)
 {
     Z_SearchRequest *r = (Z_SearchRequest *)odr_malloc(o, sizeof(*r));
 
@@ -88,7 +91,7 @@ Z_SearchRequest *zget_SearchRequest(ODR o)
     return r;
 }
 
-Z_SearchResponse *zget_SearchResponse(ODR o)
+static Z_SearchResponse *zget_SearchResponse(ODR o)
 {
     Z_SearchResponse *r = (Z_SearchResponse *)odr_malloc(o, sizeof(*r));
 
@@ -105,7 +108,7 @@ Z_SearchResponse *zget_SearchResponse(ODR o)
     return r;
 }
 
-Z_PresentRequest *zget_PresentRequest(ODR o)
+static Z_PresentRequest *zget_PresentRequest(ODR o)
 {
     Z_PresentRequest *r = (Z_PresentRequest *)odr_malloc(o, sizeof(*r));
 
@@ -124,7 +127,7 @@ Z_PresentRequest *zget_PresentRequest(ODR o)
     return r;
 }
 
-Z_PresentResponse *zget_PresentResponse(ODR o)
+static Z_PresentResponse *zget_PresentResponse(ODR o)
 {
     Z_PresentResponse *r = (Z_PresentResponse *)odr_malloc(o, sizeof(*r));
 
@@ -137,7 +140,7 @@ Z_PresentResponse *zget_PresentResponse(ODR o)
     return r;
 }
 
-Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
+static Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
 {
     Z_DeleteResultSetRequest *r = (Z_DeleteResultSetRequest *)
         odr_malloc(o, sizeof(*r));
@@ -150,11 +153,11 @@ Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
     return r;
 }
 
-Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
+static Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
 {
     Z_DeleteResultSetResponse *r = (Z_DeleteResultSetResponse *)
         odr_malloc(o, sizeof(*r));
-    
+
     r->referenceId = 0;
     r->deleteOperationStatus = odr_intdup(o, Z_DeleteStatus_success);
     r->deleteListStatuses = 0;
@@ -165,10 +168,10 @@ Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
     return r;
 }
 
-Z_ScanRequest *zget_ScanRequest(ODR o)
+static Z_ScanRequest *zget_ScanRequest(ODR o)
 {
     Z_ScanRequest *r = (Z_ScanRequest *)odr_malloc(o, sizeof(*r));
-    
+
     r->referenceId = 0;
     r->num_databaseNames = 0;
     r->databaseNames = 0;
@@ -181,10 +184,10 @@ Z_ScanRequest *zget_ScanRequest(ODR o)
     return r;
 }
 
-Z_ScanResponse *zget_ScanResponse(ODR o)
+static Z_ScanResponse *zget_ScanResponse(ODR o)
 {
     Z_ScanResponse *r = (Z_ScanResponse *)odr_malloc(o, sizeof(*r));
-    
+
     r->referenceId = 0;
     r->stepSize = 0;
     r->scanStatus = odr_intdup(o, Z_Scan_success);
@@ -196,11 +199,11 @@ Z_ScanResponse *zget_ScanResponse(ODR o)
     return r;
 }
 
-Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
+static Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
 {
     Z_TriggerResourceControlRequest *r = (Z_TriggerResourceControlRequest *)
         odr_malloc(o, sizeof(*r));
-    
+
     r->referenceId = 0;
     r->requestedAction = odr_intdup(o, Z_TriggerResourceControlRequest_resourceReport);
     r->prefResourceReportFormat = 0;
@@ -209,7 +212,7 @@ Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
     return r;
 }
 
-Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
+static Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
 {
     Z_ResourceControlRequest *r = (Z_ResourceControlRequest *)
         odr_malloc(o, sizeof(*r));
@@ -224,7 +227,7 @@ Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
     return r;
 }
 
-Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
+static Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
 {
     Z_ResourceControlResponse *r = (Z_ResourceControlResponse *)
         odr_malloc(o, sizeof(*r));
@@ -236,7 +239,7 @@ Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
     return r;
 }
 
-Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
+static Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
 {
     Z_AccessControlRequest *r = (Z_AccessControlRequest *)
         odr_malloc(o, sizeof(*r));
@@ -248,7 +251,7 @@ Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
     return r;
 }
 
-Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
+static Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
 {
     Z_AccessControlResponse *r = (Z_AccessControlResponse *)
         odr_malloc(o, sizeof(*r));
@@ -261,7 +264,7 @@ Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
     return r;
 }
 
-Z_Segment *zget_Segment(ODR o)
+static Z_Segment *zget_Segment(ODR o)
 {
     Z_Segment *r = (Z_Segment *)odr_malloc(o, sizeof(*r));
 
@@ -273,7 +276,7 @@ Z_Segment *zget_Segment(ODR o)
     return r;
 }
 
-Z_Close *zget_Close(ODR o)
+static Z_Close *zget_Close(ODR o)
 {
     Z_Close *r = (Z_Close *)odr_malloc(o, sizeof(*r));
 
@@ -286,7 +289,7 @@ Z_Close *zget_Close(ODR o)
     return r;
 }
 
-Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
+static Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
 {
     Z_ResourceReportRequest *r = (Z_ResourceReportRequest *)
         odr_malloc(o, sizeof(*r));
@@ -298,7 +301,7 @@ Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
     return r;
 }
 
-Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
+static Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
 {
     Z_ResourceReportResponse *r = (Z_ResourceReportResponse *)
         odr_malloc(o, sizeof(*r));
@@ -310,7 +313,7 @@ Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
     return r;
 }
 
-Z_SortRequest *zget_SortRequest(ODR o)
+static Z_SortRequest *zget_SortRequest(ODR o)
 {
     Z_SortRequest *r = (Z_SortRequest *)odr_malloc(o, sizeof(*r));
 
@@ -322,7 +325,7 @@ Z_SortRequest *zget_SortRequest(ODR o)
     return r;
 }
 
-Z_SortResponse *zget_SortResponse(ODR o)
+static Z_SortResponse *zget_SortResponse(ODR o)
 {
     Z_SortResponse *r = (Z_SortResponse *)odr_malloc(o, sizeof(*r));
 
@@ -335,7 +338,7 @@ Z_SortResponse *zget_SortResponse(ODR o)
     return r;
 }
 
-Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
+static Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
 {
     Z_ExtendedServicesRequest *r = (Z_ExtendedServicesRequest *)
         odr_malloc(o, sizeof(*r));
@@ -355,7 +358,7 @@ Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
     return r;
 }
 
-Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
+static Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
 {
     Z_ExtendedServicesResponse *r = (Z_ExtendedServicesResponse *)
         odr_malloc(o, sizeof(*r));
@@ -369,11 +372,11 @@ Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
     return r;
 }
 
-Z_DuplicateDetectionRequest *zget_DuplicateDetectionRequest(ODR o)
+static Z_DuplicateDetectionRequest *zget_DuplicateDetectionRequest(ODR o)
 {
     Z_DuplicateDetectionRequest *r = (Z_DuplicateDetectionRequest *)
         odr_malloc(o, sizeof(*r));
-    
+
     r->referenceId = 0;
     r->num_inputResultSetIds = 0;
     r->inputResultSetIds = 0;
@@ -390,11 +393,11 @@ Z_DuplicateDetectionRequest *zget_DuplicateDetectionRequest(ODR o)
     return r;
 }
 
-Z_DuplicateDetectionResponse *zget_DuplicateDetectionResponse(ODR o)
+static Z_DuplicateDetectionResponse *zget_DuplicateDetectionResponse(ODR o)
 {
     Z_DuplicateDetectionResponse *r = (Z_DuplicateDetectionResponse *)
         odr_malloc(o, sizeof(*r));
- 
+
     r->referenceId = 0;
     r->status = odr_intdup(o, Z_DuplicateDetectionResponse_success);
     r->resultSetCount = 0;
@@ -403,11 +406,11 @@ Z_DuplicateDetectionResponse *zget_DuplicateDetectionResponse(ODR o)
     r->otherInfo = 0;
     return r;
 }
- 
+
 Z_APDU *zget_APDU(ODR o, int which)
 {
     Z_APDU *r = (Z_APDU *)odr_malloc(o, sizeof(*r));
-    
+
     switch (r->which = which)
     {
     case Z_APDU_initRequest:
@@ -495,9 +498,9 @@ Z_APDU *zget_APDU(ODR o, int which)
 Z_DefaultDiagFormat *zget_DefaultDiagFormat(ODR o, int error,
                                             const char *addinfo)
 {
-    Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) 
-        odr_malloc (o, sizeof(*dr));
-    
+    Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+        odr_malloc(o, sizeof(*dr));
+
     dr->diagnosticSetId = odr_oiddup(o, yaz_oid_diagset_bib_1);
     dr->condition = odr_intdup(o, error);
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
@@ -526,9 +529,9 @@ Z_DiagRecs *zget_DiagRecs(ODR o, int error, const char *addinfo)
 Z_NamePlusRecord *zget_surrogateDiagRec(ODR o, const char *dbname,
                                         int error, const char *addinfo)
 {
-    Z_NamePlusRecord *rec = (Z_NamePlusRecord *) odr_malloc (o, sizeof(*rec));
-    Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (o, sizeof(*drec));
-    
+    Z_NamePlusRecord *rec = (Z_NamePlusRecord *) odr_malloc(o, sizeof(*rec));
+    Z_DiagRec *drec = (Z_DiagRec *)odr_malloc(o, sizeof(*drec));
+
     if (dbname)
         rec->databaseName = odr_strdup(o, dbname);
     else
@@ -550,7 +553,7 @@ Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
 
     x = (Z_External*) odr_malloc(odr, sizeof *x);
     x->descriptor = 0;
-    x->indirect_reference = 0;  
+    x->indirect_reference = 0;
     x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
     x->which = Z_External_userInfo1;
 
@@ -573,8 +576,8 @@ Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
     d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
     x2->u.diag1 = d;
     d->num = 1;
-    d->elements = (Z_DiagnosticFormat_s**) odr_malloc (odr, sizeof *d->elements);
-    d->elements[0] = (Z_DiagnosticFormat_s*) odr_malloc (odr, sizeof *d->elements[0]);
+    d->elements = (Z_DiagnosticFormat_s**) odr_malloc(odr, sizeof *d->elements);
+    d->elements[0] = (Z_DiagnosticFormat_s*) odr_malloc(odr, sizeof *d->elements[0]);
     e = d->elements[0];
 
     e->which = Z_DiagnosticFormat_s_defaultDiagRec;
@@ -614,8 +617,8 @@ Z_External *zget_init_diagnostics_octet(ODR odr, int error,
     d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
     x2->u.diag1 = d;
     d->num = 1;
-    d->elements = (Z_DiagnosticFormat_s**) odr_malloc (odr, sizeof *d->elements);
-    d->elements[0] = (Z_DiagnosticFormat_s*) odr_malloc (odr, sizeof *d->elements[0]);
+    d->elements = (Z_DiagnosticFormat_s**) odr_malloc(odr, sizeof *d->elements);
+    d->elements[0] = (Z_DiagnosticFormat_s*) odr_malloc(odr, sizeof *d->elements[0]);
     e = d->elements[0];
 
     e->which = Z_DiagnosticFormat_s_defaultDiagRec;
@@ -630,13 +633,10 @@ Z_External *zget_init_diagnostics_octet(ODR odr, int error,
 
     x = (Z_External*) odr_malloc(odr, sizeof *x);
     x->descriptor = 0;
-    x->indirect_reference = 0;  
+    x->indirect_reference = 0;
     x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
     x->which = Z_External_octet;
-    x->u.octet_aligned = (Odr_oct *) odr_malloc(odr, sizeof(Odr_oct));
-    x->u.octet_aligned->buf = (unsigned char *) odr_malloc(odr, octet_len);
-    memcpy(x->u.octet_aligned->buf, octet_buf, octet_len);
-    x->u.octet_aligned->len = octet_len;
+    x->u.octet_aligned = odr_create_Odr_oct(odr, octet_buf, octet_len);
 
     odr_destroy(encode);