Revert "ORTE: add support for param structure in TypeRegister"

This reverts commit 3ee9dd9cded871b38859b1881c4d98548f5b688e.

diff --git a/orte/include/orte/protos_api.h b/orte/include/orte/protos_api.h
index f5c9beaf6713f7b4f3969b3599c84b9b9503ef24..897249fb34e52fa38bf049b7b9c6bb000acedd71 100644 (file)
--- a/orte/include/orte/protos_api.h
+++ b/orte/include/orte/protos_api.h
@@ -446,8 +446,7 @@ ORTESubscriptionGetInstance(ORTESubscription *cstReader);
  */
 extern int
 ORTETypeRegisterAdd(ORTEDomain *d,const char *typeName,ORTETypeSerialize ts,
-                    ORTETypeDeserialize ds,ORTETypeGetMaxSize gms,
-                    unsigned int ms,ORTETypeProcessEndianness pe,void *pep);
+                    ORTETypeDeserialize ds,ORTETypeGetMaxSize gms,unsigned int ms);
 /**
  * ORTETypeRegisterDestroyAll - destroy all registered data types
  * @d: domain object handle

diff --git a/orte/include/orte/typedefs_api.h b/orte/include/orte/typedefs_api.h
index a23292481839eba59fdcb596baf95b64a42a7ca1..7d45bb9ebd8cfeabc4a34c3592bfd94631a4334b 100644 (file)
--- a/orte/include/orte/typedefs_api.h
+++ b/orte/include/orte/typedefs_api.h
@@ -141,8 +141,6 @@ typedef void (*ORTETypeDeserialize)(CDR_Codec *cdrCodec, void *instance);
 
 typedef int (*ORTETypeGetMaxSize)(ORTEGetMaxSizeParam *gms, int num);
 
-typedef void (*ORTETypeProcessEndianness)(CDR_Codec *cdrCodec, void *param);
-
 /**
  * struct ORTETypeRegister - registered data type
  * @typeName: name of data type 
@@ -150,19 +148,15 @@ typedef void (*ORTETypeProcessEndianness)(CDR_Codec *cdrCodec, void *param);
  * @deserialize: pointer to deserialization function
  * @getMaxSize: pointer to function given maximal data length
  * @maxSize: maximal size of ser./deser. data
- * @processEndianness: allows application to adjust some preferences according to byte order
- * @processParam: pointer to user structure containing parameters for processEndianness
  *
  * Contains description of registered data type. See @ORTETypeRegisterAdd function for details.
  */
 typedef struct ORTETypeRegister {
-  const char                  *typeName;
-  ORTETypeSerialize           serialize;
-  ORTETypeDeserialize         deserialize;
-  ORTETypeGetMaxSize          getMaxSize;
-  unsigned int                maxSize;
-  ORTETypeProcessEndianness   processEndianness;
-  void                        *processParam;
+  const char             *typeName;
+  ORTETypeSerialize      serialize;
+  ORTETypeDeserialize    deserialize;
+  ORTETypeGetMaxSize     getMaxSize;
+  unsigned int          maxSize;
 } ORTETypeRegister;
 
 /**

diff --git a/orte/liborte/ORTETypeRegister.c b/orte/liborte/ORTETypeRegister.c
index 6741b62c0c7c3bebacc32adf6e838dd3b151ee9b..8c6511c45a94e7fee70f6f20dc322092c1bcae7a 100644 (file)
--- a/orte/liborte/ORTETypeRegister.c
+++ b/orte/liborte/ORTETypeRegister.c
@@ -53,8 +53,7 @@ ORTETypeRegisterFind(ORTEDomain *d,const char *typeName) {
 /*****************************************************************************/
 int
 ORTETypeRegisterAdd(ORTEDomain *d,const char *typeName,ORTETypeSerialize ts,
-                    ORTETypeDeserialize ds,ORTETypeGetMaxSize gms,
-                    unsigned int ms,ORTETypeProcessEndianness pe,void *pep) {
+                    ORTETypeDeserialize ds,ORTETypeGetMaxSize gms,unsigned int ms) {
   TypeNode           *tn;
   
   if (!d) 
@@ -82,8 +81,6 @@ ORTETypeRegisterAdd(ORTEDomain *d,const char *typeName,ORTETypeSerialize ts,
   tn->typeRegister.deserialize=ds;
   tn->typeRegister.getMaxSize=gms;
   tn->typeRegister.maxSize=ms;
-  tn->typeRegister.processEndianness=pe;
-  tn->typeRegister.processParam=pep;
   pthread_rwlock_unlock(&d->typeEntry.lock);    
   debug(26,3) ("ORTETypeRegisterAdd: registered type:%s\n",typeName);
   return ORTE_OK;

diff --git a/orte/liborte/RTPSCSTReaderProc.c b/orte/liborte/RTPSCSTReaderProc.c
index b5832b7034515f9ff4096b424370ed009865bfca..0abd3ba03069c471283e3af04384fafb83905b89 100644 (file)
--- a/orte/liborte/RTPSCSTReaderProc.c
+++ b/orte/liborte/RTPSCSTReaderProc.c
@@ -228,11 +228,6 @@ CSTReaderNewData(CSTRemoteWriter *cstRemoteWriter,
       memcpy(objectEntryOID->instance,
              csChange->cdrCodec.buffer,
              max_size);
-      if(cstRemoteWriter->cstReader->typeRegister->processEndianness) {
-        cstRemoteWriter->cstReader->typeRegister->processEndianness(
-            &csChange->cdrCodec,
-            cstRemoteWriter->cstReader->typeRegister->processParam);
-      }
     }
     info.status=NEW_DATA;
     info.topic=(char*)sp->topic;