Happy new year

[yazpp-moved-to-github.git] / zlint / test-init-08.cpp

diff --git a/zlint/test-init-08.cpp b/zlint/test-init-08.cpp
index e3b187c..b4c3a65 100644 (file)
--- a/zlint/test-init-08.cpp
+++ b/zlint/test-init-08.cpp
@@ -1,11 +1,9 @@
-/*
- * Copyright (c) 2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2009 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: test-init-08.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/charneg.h>
 #include <yaz/otherinfo.h>
 
@@ -37,8 +35,8 @@ Zlint_code Zlint_test_init_08::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;
 }
@@ -46,25 +44,23 @@ Zlint_code Zlint_test_init_08::init(Zlint *z)
 Zlint_code Zlint_test_init_08::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 (m_no * m_no * 100000 + 2000 < *init->maximumRecordSize)
-           z->msg_check_fail("maximumRecordSize bigger than proposed size");
-       if (m_no * m_no * 100000 + 2000 < *init->preferredMessageSize)
-           z->msg_check_fail("preferredMessage bigger than proposed size");
-       z->msg_check_ok();
-       if (m_no < 2)
-       {
-           m_no++;
-           return TEST_REOPEN;
-       }
+        Z_InitResponse *init = gdu->u.z3950->u.initResponse;
+        
+        if (m_no * m_no * 100000 + 2000 < *init->maximumRecordSize)
+            z->msg_check_fail("maximumRecordSize bigger than proposed size");
+        if (m_no * m_no * 100000 + 2000 < *init->preferredMessageSize)
+            z->msg_check_fail("preferredMessage bigger than proposed size");
+        z->msg_check_ok();
+        if (m_no < 2)
+        {
+            m_no++;
+            return TEST_REOPEN;
+        }
     }
     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;
 }
 
@@ -73,9 +69,17 @@ Zlint_code Zlint_test_init_08::recv_fail(Zlint *z, int reason)
     z->msg_check_fail("target closed connection");
     if (m_no < 2)
     {
-       m_no++;
-       return TEST_REOPEN;
+        m_no++;
+        return TEST_REOPEN;
     }
     return TEST_FINISHED;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+