Expanded tabs in all source files. Added vim/emacs local variables

[yazpp-moved-to-github.git] / src / yaz-z-server.cpp

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 06992b7..68bab4c 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server.cpp,v 1.22 2005-06-08 13:28:06 adam Exp $
+ * $Id: yaz-z-server.cpp,v 1.23 2005-06-25 15:53:19 adam Exp $
  */
 
 #include <yaz/log.h>
@@ -26,21 +26,21 @@ void Z_Server::facility_reset ()
     Z_Server_Facility_Info *p = m_facilities;
     while (p)
     {
-       Z_Server_Facility_Info *p_next = p->m_next;
+        Z_Server_Facility_Info *p_next = p->m_next;
 
-       delete [] p->m_name;
-       delete p;
-       p = p_next;
+        delete [] p->m_name;
+        delete p;
+        p = p_next;
     }
     m_facilities = 0;
 }
 
 void Z_Server::facility_add(IServer_Facility *facility,
-                           const char *name)
+                            const char *name)
 {
     Z_Server_Facility_Info **p = &m_facilities;
     while (*p)
-       p = &(*p)->m_next;
+        p = &(*p)->m_next;
 
     *p = new Z_Server_Facility_Info;
 
@@ -53,9 +53,9 @@ void Z_Server::facility_add(IServer_Facility *facility,
 void Z_Server::recv_GDU (Z_GDU *apdu, int len)
 {
     if (apdu->which == Z_GDU_Z3950)
-       recv_Z_PDU(apdu->u.z3950, len);
+        recv_Z_PDU(apdu->u.z3950, len);
     else
-       delete this;
+        delete this;
 }
 
 void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
@@ -64,47 +64,47 @@ void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
     
     if (apdu_request->which == Z_APDU_initRequest)
     {
-       Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse);
-
-       Z_InitRequest *req = apdu_request->u.initRequest;
-       Z_InitResponse *resp = apdu_response->u.initResponse;
-       
-       if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
-       {
-           ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
-       }
-       if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
-       {
-           ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2);
-       }
-       if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3))
-       {
-           ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3);
-       }
-       while (f)
-       {
-           f->m_facility->init(this, req, resp);
-           f = f->m_next;
-       }
-       transfer_referenceId(apdu_request, apdu_response);
-       send_Z_PDU(apdu_response, 0);
+        Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse);
+
+        Z_InitRequest *req = apdu_request->u.initRequest;
+        Z_InitResponse *resp = apdu_response->u.initResponse;
+        
+        if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
+        {
+            ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
+        }
+        if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
+        {
+            ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2);
+        }
+        if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3))
+        {
+            ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3);
+        }
+        while (f)
+        {
+            f->m_facility->init(this, req, resp);
+            f = f->m_next;
+        }
+        transfer_referenceId(apdu_request, apdu_response);
+        send_Z_PDU(apdu_response, 0);
     }
     else
     {
-       f = m_facilities;
-       int taken = 0;
-       while (f)
-       {
-           taken = f->m_facility->recv(this, apdu_request);
-           if (taken)
-               break;
-           f = f->m_next;
-       }
-       if (!taken)
-       {
-           yaz_log (YLOG_WARN, "unhandled request = %d", apdu_request->which);
-           delete this;
-       }
+        f = m_facilities;
+        int taken = 0;
+        while (f)
+        {
+            taken = f->m_facility->recv(this, apdu_request);
+            if (taken)
+                break;
+            f = f->m_next;
+        }
+        if (!taken)
+        {
+            yaz_log (YLOG_WARN, "unhandled request = %d", apdu_request->which);
+            delete this;
+        }
     }
 }
 
@@ -118,7 +118,7 @@ void Z_ServerUtility::create_databaseRecord (
     rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
     rec->which = Z_NamePlusRecord_databaseRecord;
     rec->u.databaseRecord = z_ext_record (odr, format,
-                                         (const char *) buf, len);
+                                          (const char *) buf, len);
 }
 
 /*
@@ -131,7 +131,7 @@ void Z_ServerUtility::create_surrogateDiagnostics(
     int *err = (int *)odr_malloc (odr, sizeof(*err));
     Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (odr, sizeof(*drec));
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
-       odr_malloc (odr, sizeof(*dr));
+        odr_malloc (odr, sizeof(*dr));
     
     yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
     *err = error;
@@ -192,3 +192,11 @@ void Z_ServerUtility::create_diagnostics (
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
     dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+