X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzget.c;h=5e9af9c0dfff1e19e58b023af96b188c18d1b5af;hp=cbc9c542249c1589d6a86abfbf8ee734d5f2edef;hb=896b145fa7a02199bfc3e8aa824c018b9d7cbf98;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7 diff --git a/src/zget.c b/src/zget.c index cbc9c54..5e9af9c 100644 --- a/src/zget.c +++ b/src/zget.c @@ -1,16 +1,19 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ /** * \file zget.c * \brief Implements Z39.50 package creator utilities */ +#if HAVE_CONFIG_H +#include +#endif #include #include -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)); @@ -54,7 +57,7 @@ Z_InitResponse *zget_InitResponse(ODR o) ODR_MASK_ZERO(r->protocolVersion); r->preferredMessageSize = odr_intdup(o, 30*1024); r->maximumRecordSize = odr_intdup(o, 30*1024); - r->result = odr_intdup(o, 1); + r->result = odr_booldup(o, 1); r->implementationId = "81"; r->implementationName = "YAZ"; r->implementationVersion = YAZ_VERSION @@ -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)); @@ -75,7 +78,7 @@ Z_SearchRequest *zget_SearchRequest(ODR o) r->smallSetUpperBound = odr_intdup(o, 0); r->largeSetLowerBound = odr_intdup(o, 1); r->mediumSetPresentNumber = odr_intdup(o, 0); - r->replaceIndicator = odr_intdup(o, 1); + r->replaceIndicator = odr_booldup(o, 1); r->resultSetName = "default"; r->num_databaseNames = 0; r->databaseNames = 0; @@ -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)); @@ -96,7 +99,7 @@ Z_SearchResponse *zget_SearchResponse(ODR o) r->resultCount = odr_intdup(o, 0); r->numberOfRecordsReturned = odr_intdup(o, 0); r->nextResultSetPosition = odr_intdup(o, 0); - r->searchStatus = odr_intdup(o, 1); + r->searchStatus = odr_booldup(o, 1); r->resultSetStatus = 0; r->presentStatus = 0; r->records = 0; @@ -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,7 +153,7 @@ 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)); @@ -165,7 +168,7 @@ 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)); @@ -181,7 +184,7 @@ 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)); @@ -196,7 +199,7 @@ 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)); @@ -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)); @@ -218,25 +221,25 @@ Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o) r->suspendedFlag = 0; r->resourceReport = 0; r->partialResultsAvailable = 0; - r->responseRequired = odr_intdup(o, 0); + r->responseRequired = odr_booldup(o, 0); r->triggeredRequestFlag = 0; r->otherInfo = 0; 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)); r->referenceId = 0; - r->continueFlag = odr_intdup(o, 1); + r->continueFlag = odr_booldup(o, 1); r->resultSetWanted = 0; r->otherInfo = 0; 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,7 +372,7 @@ 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)); @@ -390,7 +393,7 @@ 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)); @@ -646,6 +649,7 @@ Z_External *zget_init_diagnostics_octet(ODR odr, int error, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab