X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=zlint%2Ftest-init-04.cpp;h=be14886afcced701e99049d65066bab069241f82;hp=14e9ac799094f9981b8d71ab96232899aef5f411;hb=8353663886b90d762d43790780be6cb58fb93c8a;hpb=491fb0058392b83d1e44eaa7494e827f3530f3dd diff --git a/zlint/test-init-04.cpp b/zlint/test-init-04.cpp index 14e9ac7..be14886 100644 --- a/zlint/test-init-04.cpp +++ b/zlint/test-init-04.cpp @@ -1,8 +1,6 @@ -/* - * Copyright (c) 2004, Index Data. +/* This file is part of the yazpp toolkit. + * Copyright (C) 1998-2011 Index Data and Mike Taylor * See the file LICENSE for details. - * - * $Id: test-init-04.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $ */ #include @@ -34,8 +32,8 @@ Zlint_code Zlint_test_init_04::init(Zlint *z) int r = z->send_Z_PDU(apdu, &len); if (r < 0) { - z->msg_check_fail("unable to send init request"); - return TEST_FINISHED; + z->msg_check_fail("unable to send init request"); + return TEST_FINISHED; } return TEST_CONTINUE; } @@ -43,21 +41,28 @@ Zlint_code Zlint_test_init_04::init(Zlint *z) Zlint_code Zlint_test_init_04::recv_gdu(Zlint *z, Z_GDU *gdu) { if (gdu->which == Z_GDU_Z3950 && - gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_initResponse) + gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_initResponse) { - Z_InitResponse *init = gdu->u.z3950->u.initResponse; - int ver = z->initResponseGetVersion(init); - int result = init->result ? *init->result : 0; - - if (!init->referenceId) - z->msg_check_fail("missing referenceID from init response"); - else if (init->referenceId->len != REFID_LEN1 - || memcmp(init->referenceId->buf, REFID_BUF1, REFID_LEN1)) - z->msg_check_fail("reference ID does not match"); - z->msg_check_ok(); + Z_InitResponse *init = gdu->u.z3950->u.initResponse; + + if (!init->referenceId) + z->msg_check_fail("missing referenceID from init response"); + else if (init->referenceId->len != REFID_LEN1 + || memcmp(init->referenceId->buf, REFID_BUF1, REFID_LEN1)) + z->msg_check_fail("reference ID does not match"); + z->msg_check_ok(); } else - z->msg_check_fail("did not receive init response as expected"); + z->msg_check_fail("did not receive init response as expected"); return TEST_FINISHED; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +