Changeset 2261

Timestamp:

2001-04-03T02:13:26+12:00 (23 years ago)

Author:

say1

Message:

fixed a minor c initialisation bug

Location:

trunk/gsdl

Files:

• lib/corbaiface.h (modified) (2 diffs)
• lib/corbaiface.mpp (modified) (2 diffs)
• lib/corbaiface_skel.mpp (modified) (1 diff)
• src/colservr/corbaServer.mpp (modified) (6 diffs)
• src/recpt/OIDtools.cpp (modified) (4 diffs)
• src/recpt/collectoraction.cpp (modified) (3 diffs)
• src/recpt/corbaproto.mpp (modified) (1 diff)

trunk/gsdl/lib/corbaiface.h

@@ -489 +489 @@
     virtual void collectionList( corbatext_tarray& collist, corbaComError& error ) = 0;
     virtual void hasCollection( const corbatext_t& corbaCollection, CORBA::Boolean& has, corbaComError& error ) = 0;
-    virtual CORBA::Boolean ping( const corbatext_t& collection, corbaComError& error ) = 0;
+    virtual void ping( const corbatext_t& collection, CORBA::Boolean& wasSuccess, corbaComError& error ) = 0;
     virtual void getDocument( const corbatext_t& collection, corbaDocRequest& request, corbaDocResponse& response, corbaComError& error ) = 0;
     virtual void getCollectInfo( const corbatext_t& collection, corbaColInfoResponse& response, corbaComError& error ) = 0;
@@ -513 +513 @@
     void collectionList( corbatext_tarray& collist, corbaComError& error );
     void hasCollection( const corbatext_t& corbaCollection, CORBA::Boolean& has, corbaComError& error );
-    CORBA::Boolean ping( const corbatext_t& collection, corbaComError& error );
+    void ping( const corbatext_t& collection, CORBA::Boolean& wasSuccess, corbaComError& error );
     void getDocument( const corbatext_t& collection, corbaDocRequest& request, corbaDocResponse& response, corbaComError& error );
     void getCollectInfo( const corbatext_t& collection, corbaColInfoResponse& response, corbaComError& error );

trunk/gsdl/lib/corbaiface.mpp

@@ -1501 +1501 @@
 
 
-CORBA::Boolean gsdlInterface::corbaiface_stub::ping( const gsdlInterface::corbatext_t& collection, gsdlInterface::corbaComError& error )
+void gsdlInterface::corbaiface_stub::ping( const gsdlInterface::corbatext_t& collection, CORBA::Boolean& wasSuccess, gsdlInterface::corbaComError& error )
 {
   CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
+  CORBA::StaticAny _wasSuccess( CORBA::_stc_boolean, &wasSuccess );
   CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::Boolean _res;
-  CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
-
   CORBA::StaticRequest __req( this, "ping" );
   __req.add_in_arg( &_collection );
+  __req.add_inout_arg( &_wasSuccess );
   __req.add_inout_arg( &_error );
-  __req.set_result( &__res );
 
   __req.invoke();
@@ -1517 +1515 @@
   mico_sii_throw( &__req, 
     0);
-  return _res;
 }
 

trunk/gsdl/lib/corbaiface_skel.mpp

@@ -67 +67 @@
         corbatext_t collection;
         CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        CORBA::Boolean _res;
-        CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
-        _req->add_in_arg( &_collection );
-        _req->add_inout_arg( &_error );
-        _req->set_result( &__res );
-
-        if( !_req->read_args() )
-          return true;
-
-        _res = ping( collection, error );
+        CORBA::Boolean wasSuccess;
+        CORBA::StaticAny _wasSuccess( CORBA::_stc_boolean, &wasSuccess );
+        corbaComError error;
+        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
+
+        _req->add_in_arg( &_collection );
+        _req->add_inout_arg( &_wasSuccess );
+        _req->add_inout_arg( &_error );
+
+        if( !_req->read_args() )
+          return true;
+
+        ping( collection, wasSuccess, error );
         _req->write_results();
         return true;

trunk/gsdl/src/colservr/corbaServer.mpp

@@ -106 +106 @@
       ofstream      logout;
       int           reply;
-      comerror_t    error;
+      comerror_t    error = noError;
 
       this->openLogfile("/etc/corbaout.txt", logout);
@@ -118 +118 @@
       text_t        key;
       text_tarray   cfgline;
-      comerror_t    error;
+      comerror_t    error = noError;
 
       corbaconv_text_t::setCorbatext(key,corbaKey);
@@ -160 +160 @@
     corbaconv_text_t *cct;
     bool    _has;
-    comerror_t err;
+    comerror_t err = noError;
     ofstream logout;
 
@@ -191 +191 @@
     text_t collection;
     bool   success;
-    comerror_t error;
+    comerror_t error = noError;
     ofstream logout;
 
@@ -250 +250 @@
   {
     ColInfoResponse_t response;
-    comerror_t       error;
+    comerror_t       error = noError;
     text_t           collection;
     ofstream logout;
@@ -304 +304 @@
     InfoFilterOptionsRequest_t request;
     InfoFilterOptionsResponse_t response;
-    comerror_t error;
+    comerror_t error = noError;
     unsigned int i;
     ofstream logout;

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -82 +82 @@
   response.clear();
 
-  comerror_t err;
+  comerror_t err = noError;
   FilterRequest_t request;
   request.clear();
@@ -115 +115 @@
   response.clear();
 
-  comerror_t err;
+  comerror_t err = noError;
   FilterRequest_t request;
 
@@ -147 +147 @@
   if (OIDs.empty()) return true;
 
-  comerror_t err;
+  comerror_t err = noError;
   FilterRequest_t request;
 
@@ -198 +198 @@
   response.clear();
 
-  comerror_t err;
+  comerror_t err = noError;
   FilterRequest_t request;
   OptionValue_t option;

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -676 +676 @@
 
       // don't include z39.50 collection
-      comerror_t err;
+      comerror_t err = noError;
       if ((*rprotolist_here).p->get_protocol_name (err) == "z3950proto") {
     rprotolist_here ++;
@@ -1584 +1584 @@
   recptprotolistclass::iterator rprotolist_end = protos->end();
   while (rprotolist_here != rprotolist_end) {
-    comerror_t err;
+    comerror_t err = noError;
     if ((*rprotolist_here).p != NULL) {
       if ((*rprotolist_here).p->get_protocol_name (err) == "nullproto") {
@@ -1615 +1615 @@
   recptprotolistclass::iterator rprotolist_end = protos->end();
   while (rprotolist_here != rprotolist_end) {
-    comerror_t err;
+    comerror_t err = noError;
     if ((*rprotolist_here).p != NULL) {
       if ((*rprotolist_here).p->get_protocol_name (err) == "nullproto") {

trunk/gsdl/src/recpt/corbaproto.mpp

@@ -558 +558 @@
   wassuccess = (success != 0);
   err = (comerror_t) corbaError;  
+  cout << "Corbaproto::Ping" << err << endl;
 }