X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=zlint%2Ftest-init-06.cpp;h=27eb9fbc845bb2de8dfca9593e7487c51bad69c7;hp=8d4e5969cf8e7d4b42ae8176d513910c616e392c;hb=6b22d0543d41bec8626f3ae7ac866bcab7de44bd;hpb=40213edfa0408f88b008c3d1ee4a4f90dcdf2fb9

diff --git a/zlint/test-init-06.cpp b/zlint/test-init-06.cpp
index 8d4e596..27eb9fb 100644
--- a/zlint/test-init-06.cpp
+++ b/zlint/test-init-06.cpp
@@ -1,8 +1,6 @@
-/*
- * 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-06.cpp,v 1.1 2004-03-25 23:14:07 adam Exp $
  */
 
 #include <yaz/log.h>
@@ -30,13 +28,13 @@ Zlint_code Zlint_test_init_06::init(Zlint *z)
     ODR_MASK_ZERO(init->options);
     int i;
     for (i = 0; i <= 24; i++)
-	ODR_MASK_SET(init->options, i);
+        ODR_MASK_SET(init->options, i);
 
     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;
 }
@@ -44,38 +42,45 @@ Zlint_code Zlint_test_init_06::init(Zlint *z)
 Zlint_code Zlint_test_init_06::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->options)
-	{
-	    int i;
-	    int no_set = 0;
-	    int no_reset = 0;
-	    for (i = 0; i <= 24; i++)
-		if (ODR_MASK_GET(init->options, i))
-		    no_set++;
-		else
-		    no_reset++;
-	    if (no_set < 2)
-	    {
-		z->msg_check_fail("suspicuously few option bits set");
-		return TEST_FINISHED;
-	    }
-	    if (no_reset == 0)
-	    {
-		z->msg_check_fail("suspicuously many option bits set");
-		return TEST_FINISHED;
-	    }
-	}
-	z->msg_check_ok();
+        Z_InitResponse *init = gdu->u.z3950->u.initResponse;
+        
+        if (init->options)
+        {
+            int i;
+            int no_set = 0;
+            int no_reset = 0;
+            for (i = 0; i <= 24; i++)
+                if (ODR_MASK_GET(init->options, i))
+                    no_set++;
+                else
+                    no_reset++;
+            if (no_set < 2)
+            {
+                z->msg_check_fail("suspicuously few option bits set");
+                return TEST_FINISHED;
+            }
+            if (no_reset == 0)
+            {
+                z->msg_check_fail("suspicuously many option bits set");
+                return TEST_FINISHED;
+            }
+        }
+        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
+ */
+