X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Frequestq.c;h=63ce3f36a1ec7796c88a2a74e684af46c8c93cba;hb=c80275992d29b4815dd25d9203e094ae2880f1ae;hp=80fe7e838c8ac2c9d0ea44b808b1ffcb4497717a;hpb=69e1deffc8ce5541d72110417f9e555f7e33aac2;p=yaz-moved-to-github.git

diff --git a/server/requestq.c b/server/requestq.c
index 80fe7e8..63ce3f3 100644
--- a/server/requestq.c
+++ b/server/requestq.c
@@ -1,20 +1,9 @@
 /*
- * Copyright (C) 1994, Index Data.
+ * Copyright (C) 1994-2003, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: requestq.c,v $
- * Revision 1.3  1997-09-01 08:53:00  adam
- * New windows NT/95 port using MSV5.0. The test server 'ztest' was
- * moved a separate directory. MSV5.0 project server.dsp created.
- * As an option, the server can now operate as an NT service.
- *
- * Revision 1.2  1995/11/01 13:54:57  quinn
- * Minor adjustments
- *
- * Revision 1.1  1995/05/15  12:12:22  quinn
- * Request queue.
- *
+ * $Id: requestq.c,v 1.10 2003-10-20 18:20:55 adam Exp $
  *
  */
 
@@ -27,7 +16,7 @@
 
 #include <stdlib.h>
 
-#include <xmalloc.h>
+#include <yaz/xmalloc.h>
 #include "session.h"
 
 void request_enq(request_q *q, request *r)
@@ -69,6 +58,7 @@ void request_delq(request_q *q)
     request *r1, *r = q->list;
     while (r)
     {
+	xfree (r->response);
         r1 = r;
         r = r->next;
         xfree (r1);
@@ -83,16 +73,19 @@ request *request_get(request_q *q)
     	q->list = r->next;
     else
     {
-    	if (!(r = xmalloc(sizeof(*r))))
+    	if (!(r = (request *)xmalloc(sizeof(*r))))
 	    abort();
 	r->response = 0;
 	r->size_response = 0;
     }
     r->q = q;
     r->len_refid = 0;
-    r->request = 0;
+    r->refid = 0;
+    r->gdu_request = 0;
+    r->apdu_request = 0;
     r->request_mem = 0;
     r->len_response = 0;
+    r->clientData = 0;
     r->state = REQUEST_IDLE;
     r->next = 0;
     return r;
@@ -104,3 +97,4 @@ void request_release(request *r)
     r->next = q->list;
     q->list = r;
 }
+