projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e1be891
)
Fixed call to es_request handler - extra argument was passed.
author
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 18 May 1998 10:13:07 +0000
(10:13 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 18 May 1998 10:13:07 +0000
(10:13 +0000)
server/seshigh.c
patch
|
blob
|
history
diff --git
a/server/seshigh.c
b/server/seshigh.c
index
24a835d
..
2067023
100644
(file)
--- a/
server/seshigh.c
+++ b/
server/seshigh.c
@@
-4,7
+4,10
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.74 1998-03-31 15:13:20 adam
+ * Revision 1.75 1998-05-18 10:13:07 adam
+ * Fixed call to es_request handler - extra argument was passed.
+ *
+ * Revision 1.74 1998/03/31 15:13:20 adam
* Development towards compiled ASN.1.
*
* Revision 1.73 1998/03/31 11:07:45 adam
* Development towards compiled ASN.1.
*
* Revision 1.73 1998/03/31 11:07:45 adam
@@
-679,13
+682,13
@@
static int process_response(association *assoc, request *req, Z_APDU *res)
req->response = odr_getbuf(assoc->encode, &req->len_response,
&req->size_response);
odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */
req->response = odr_getbuf(assoc->encode, &req->len_response,
&req->size_response);
odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */
- odr_reset(assoc->encode);
if (assoc->print && !z_APDU(assoc->print, &res, 0))
{
logf(LOG_WARN, "ODR print error: %s",
odr_errmsg(odr_geterror(assoc->print)));
odr_reset(assoc->print);
}
if (assoc->print && !z_APDU(assoc->print, &res, 0))
{
logf(LOG_WARN, "ODR print error: %s",
odr_errmsg(odr_geterror(assoc->print)));
odr_reset(assoc->print);
}
+ odr_reset(assoc->encode);
req->state = REQUEST_IDLE;
request_enq(&assoc->outgoing, req);
/* turn the work over to the ir_session handler */
req->state = REQUEST_IDLE;
request_enq(&assoc->outgoing, req);
/* turn the work over to the ir_session handler */
@@
-1654,11
+1657,12
@@
static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
esrequest.stream = assoc->encode;
esrequest.errcode = 0;
esrequest.errstring = NULL;
esrequest.stream = assoc->encode;
esrequest.errcode = 0;
esrequest.errstring = NULL;
- esrequest.request = reqb;
- esrequest.association = assoc;
-
- (*assoc->bend_esrequest)(assoc->backend, &esrequest, fd);
-
+ esrequest.request = reqb;
+ esrequest.association = assoc;
+
+ ((int (*)(void *, bend_esrequest_rr *))(*assoc->bend_esrequest))(assoc->backend,
+ &esrequest);
+
/* If the response is being delayed, return NULL */
if (esrequest.request == NULL)
return(NULL);
/* If the response is being delayed, return NULL */
if (esrequest.request == NULL)
return(NULL);