X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zlint%2Ftest-init-07.cpp;h=732e6732a9a1832f29da6a7536315d71df793336;hb=711105a336b155f2b7f098cf84f2e30952cb8588;hp=4b2b1c5b9186ee72fae1b286950dd4d9923740ac;hpb=4b3585940162cf9ca65ca4a6914c0addcde50eef;p=yazpp-moved-to-github.git diff --git a/zlint/test-init-07.cpp b/zlint/test-init-07.cpp index 4b2b1c5..732e673 100644 --- a/zlint/test-init-07.cpp +++ b/zlint/test-init-07.cpp @@ -1,8 +1,11 @@ /* This file is part of the yazpp toolkit. - * Copyright (C) 1998-2008 Index Data and Mike Taylor + * Copyright (C) 1998-2012 Index Data and Mike Taylor * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -25,7 +28,7 @@ Zlint_code Zlint_test_init_07::init(Zlint *z) Z_OtherInformation **oi; z->msg_check_for("for character set negotiation"); - + /* set all options.. see what target really supports .. */ ODR_MASK_SET(init->protocolVersion, Z_ProtocolVersion_3); yaz_oi_APDU(apdu, &oi); @@ -45,13 +48,13 @@ Zlint_code Zlint_test_init_07::init(Zlint *z) "ISO-8859-1" }; char *yazLang = 0; - + if ((p0=yaz_oi_update(oi, z->odr_encode(), NULL, 0, 0))) { ODR_MASK_SET(init->options, Z_Options_negotiationModel); - + p0->which = Z_OtherInfo_externallyDefinedInfo; p0->information.externallyDefinedInfo = - + yaz_set_proposal_charneg( z->odr_encode(), negotiationCharset, 5, @@ -78,13 +81,13 @@ Zlint_code Zlint_test_init_07::recv_gdu(Zlint *z, Z_GDU *gdu) { Z_CharSetandLanguageNegotiation *p = yaz_get_charneg_record(init->otherInfo); - + if (p) { - + char *charset=NULL, *lang=NULL; int selected; NMEM m = nmem_create(); - + yaz_get_response_charneg(m, p, &charset, &lang, &selected); z->msg_check_ok(); @@ -106,6 +109,7 @@ Zlint_code Zlint_test_init_07::recv_gdu(Zlint *z, Z_GDU *gdu) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab