-/*
- * Copyright (c) 2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2010 Index Data and Mike Taylor
* See the file LICENSE for details.
- *
- * $Id: zlint.cpp,v 1.6 2004-09-06 07:50:51 adam Exp $
*/
#include <stdio.h>
#include <zlint.h>
+Zlint_test::~Zlint_test()
+{
+
+}
+
class Zlint_t {
public:
friend class Zlint;
int m_test_reported;
};
-Zlint::Zlint(IYaz_PDU_Observable *the_PDU_Observable) :
- Yaz_Z_Assoc(the_PDU_Observable)
+Zlint::Zlint(IPDU_Observable *the_PDU_Observable) :
+ Z_Assoc(the_PDU_Observable)
{
m_PDU_Observable = the_PDU_Observable;
{
while (m_tests)
{
- Zlint_t *t = m_tests;
- m_tests = t->m_next;
- delete t;
+ Zlint_t *t = m_tests;
+ m_tests = t->m_next;
+ delete t;
}
xfree(m_host);
xfree(m_database);
const char *basep;
cs_get_host_args(m_host, &basep);
if (!basep || !*basep)
- basep = "Default";
+ basep = "Default";
xfree(m_database);
m_database = xstrdup(basep);
}
{
if (m_cur_test)
{
- if (m_cur_test->m_t->recv_fail(this, 2) != TEST_FINISHED)
- {
- close();
- client(m_host);
- timeout(30);
- return;
- }
+ if (m_cur_test->m_t->recv_fail(this, 2) != TEST_FINISHED)
+ {
+ close();
+ client(m_host);
+ timeout(30);
+ return;
+ }
}
close_goto_next();
}
{
if (m_cur_test)
{
- if (m_cur_test->m_t->recv_fail(this, 1) != TEST_FINISHED)
- {
- close();
- client(m_host);
- timeout(30);
- return;
- }
+ if (m_cur_test->m_t->recv_fail(this, 1) != TEST_FINISHED)
+ {
+ close();
+ client(m_host);
+ timeout(30);
+ return;
+ }
}
close_goto_next();
}
{
if (m_cur_test)
{
- if (m_cur_test->m_t->init(this) != TEST_FINISHED)
- return;
+ if (m_cur_test->m_t->init(this) != TEST_FINISHED)
+ return;
}
close_goto_next();
}
{
if (m_cur_test)
{
- int r = m_cur_test->m_t->recv_gdu(this, gdu);
- if (r == TEST_CONTINUE)
- return;
- if (r == TEST_REOPEN)
- {
- close();
- client(m_host);
- timeout(30);
- return;
- }
+ int r = m_cur_test->m_t->recv_gdu(this, gdu);
+ if (r == TEST_CONTINUE)
+ return;
+ if (r == TEST_REOPEN)
+ {
+ close();
+ client(m_host);
+ timeout(30);
+ return;
+ }
}
close_goto_next();
}
{
close();
if (m_cur_test)
- m_cur_test = m_cur_test->m_next;
+ m_cur_test = m_cur_test->m_next;
if (m_cur_test)
- client(m_host);
+ client(m_host);
timeout(30);
}
-IYaz_PDU_Observer *Zlint::sessionNotify(
- IYaz_PDU_Observable *the_PDU_Observable, int fd)
+IPDU_Observer *Zlint::sessionNotify(
+ IPDU_Observable *the_PDU_Observable, int fd)
{
return 0;
}
Z_ReferenceId *Zlint::mk_refid(const char *buf, int len)
{
Z_ReferenceId *id =
- (Z_ReferenceId *) odr_malloc(odr_encode(), sizeof(*id));
+ (Z_ReferenceId *) odr_malloc(odr_encode(), sizeof(*id));
id->size = id->len = len;
id->buf = (unsigned char*) odr_malloc(odr_encode(), len);
memcpy(id->buf, buf, len);
int off = 0;
int i;
for (i = 0; i<12; i++)
- if (ODR_MASK_GET(init->protocolVersion, no))
- {
- no = i+1;
- if (off)
- yaz_log(LOG_WARN, "%sbad formatted version");
- }
- else
- off = 1;
+ if (ODR_MASK_GET(init->protocolVersion, no))
+ {
+ no = i+1;
+ }
+ else
+ off = 1;
return no;
}
{
Zlint_t **d = &m_tests;
while (*d)
- d = &(*d)->m_next;
+ d = &(*d)->m_next;
*d = new Zlint_t(t);
if (!m_cur_test)
- m_cur_test = m_tests;
+ m_cur_test = m_tests;
}
void Zlint::msg_check_for(const char *fmt, ...)
{
if (!m_cur_test->m_test_reported)
{
- m_cur_test->m_test_ok = 1;
- m_cur_test->m_test_reported = 1;
- printf ("OK\n");
+ m_cur_test->m_test_ok = 1;
+ m_cur_test->m_test_reported = 1;
+ printf ("OK\n");
}
}
{
if (!m_cur_test->m_test_reported)
{
- m_cur_test->m_test_ok = 0;
- m_cur_test->m_test_reported = 1;
- printf ("Fail\n");
+ m_cur_test->m_test_ok = 0;
+ m_cur_test->m_test_reported = 1;
+ printf ("Fail\n");
}
va_list ap;
va_start(ap, fmt);
{
if (!m_cur_test->m_test_reported)
{
- m_cur_test->m_test_ok = 2;
- m_cur_test->m_test_reported = 1;
- printf ("Unsupported\n");
+ m_cur_test->m_test_ok = 2;
+ m_cur_test->m_test_reported = 1;
+ printf ("Unsupported\n");
}
}
z->msg_check_fail("target closed connection");
return TEST_FINISHED;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+