projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove DETAILS_AT_TOP (Doxygen)
[yazpp-moved-to-github.git]
/
src
/
yaz-z-assoc.cpp
diff --git
a/src/yaz-z-assoc.cpp
b/src/yaz-z-assoc.cpp
index
f97838a
..
95c9b14
100644
(file)
--- a/
src/yaz-z-assoc.cpp
+++ b/
src/yaz-z-assoc.cpp
@@
-1,8
+1,6
@@
-/*
- * Copyright (c) 1998-2007, 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.
* See the file LICENSE for details.
- *
- * $Id: yaz-z-assoc.cpp,v 1.42 2007-04-16 21:54:23 adam Exp $
*/
#include <assert.h>
*/
#include <assert.h>
@@
-95,7
+93,7
@@
void Z_Assoc::recv_PDU(const char *buf, int len)
}
else
{
}
else
{
- close();
+ m_PDU_Observable->shutdown();
failNotify();
}
}
failNotify();
}
}
@@
-292,7
+290,7
@@
int Z_Assoc::client(const char *addr)
void Z_Assoc::close()
{
void Z_Assoc::close()
{
- m_PDU_Observable->close ();
+ m_PDU_Observable->close_session();
}
int Z_Assoc::server(const char *addr)
}
int Z_Assoc::server(const char *addr)
@@
-376,7
+374,7
@@
void Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
void Z_Assoc::set_otherInformationString(
Z_APDU *apdu,
void Z_Assoc::set_otherInformationString(
Z_APDU *apdu,
- const int *oid, int categoryValue, const char *str)
+ const Odr_oid *oid, int categoryValue, const char *str)
{
Z_OtherInformation **otherInformation;
get_otherInfoAPDU(apdu, &otherInformation);
{
Z_OtherInformation **otherInformation;
get_otherInfoAPDU(apdu, &otherInformation);
@@
-388,7
+386,7
@@
void Z_Assoc::set_otherInformationString(
void Z_Assoc::set_otherInformationString (
Z_OtherInformation **otherInformation,
void Z_Assoc::set_otherInformationString (
Z_OtherInformation **otherInformation,
- const int *oid, int categoryValue, const char *str)
+ const Odr_oid *oid, int categoryValue, const char *str)
{
Z_OtherInformationUnit *oi =
update_otherInformation(otherInformation, 1, oid, categoryValue, 0);
{
Z_OtherInformationUnit *oi =
update_otherInformation(otherInformation, 1, oid, categoryValue, 0);
@@
-399,7
+397,7
@@
void Z_Assoc::set_otherInformationString (
Z_OtherInformationUnit *Z_Assoc::update_otherInformation (
Z_OtherInformation **otherInformationP, int createFlag,
Z_OtherInformationUnit *Z_Assoc::update_otherInformation (
Z_OtherInformation **otherInformationP, int createFlag,
- const int *oid, int categoryValue, int deleteFlag)
+ const Odr_oid *oid, int categoryValue, int deleteFlag)
{
return yaz_oi_update (otherInformationP,
(createFlag ? odr_encode() : 0),
{
return yaz_oi_update (otherInformationP,
(createFlag ? odr_encode() : 0),
@@
-422,6
+420,7
@@
Z_ReferenceId* Z_Assoc::getRefID(char* str)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab