Updated to rename of CDR_* to FORB_CDR_*

diff --git a/fres/contract/fres_container.c b/fres/contract/fres_container.c
index f9d46dd9da026772dda79e9dcf12e471b7d5ac46..1c1b6db02450aab6b0c98696ab9606a4525c8ccf 100644 (file)
--- a/fres/contract/fres_container.c
+++ b/fres/contract/fres_container.c
@@ -292,7 +292,7 @@ fres_container_get_block(struct fres_container *container,
 }
 
 static CORBA_boolean
-serialize_block(CDR_Codec *codec, enum fres_block_type type, const struct fres_block *b)
+serialize_block(FORB_CDR_Codec *codec, enum fres_block_type type, const struct fres_block *b)
 {
        CORBA_boolean ret;
        CORBA_short type_short = type;
@@ -323,7 +323,7 @@ serialize_block(CDR_Codec *codec, enum fres_block_type type, const struct fres_b
        if (!(ret = CORBA_short_serialize(codec, &flags))) goto err;
        wptr_of_length = codec->wptr;
        if (!(ret = CORBA_long_serialize(codec, &length))) goto err;
-       if (!(ret = CDR_put_align(codec, 8))) goto err; /* All blocks are 8 byte aligned */
+       if (!(ret = FORB_CDR_put_align(codec, 8))) goto err; /* All blocks are 8 byte aligned */
        wptr_of_block_beg = codec->wptr;
 
        switch (b->state) {
@@ -342,8 +342,8 @@ serialize_block(CDR_Codec *codec, enum fres_block_type type, const struct fres_b
                        codec->wptr = wptr_tmp;
                        break;
                case FRES_BLOCK_STREAM:
-                       ret = CDR_buffer_puts(codec, b->u.stream.data,
-                                             b->u.stream.length);
+                       ret = FORB_CDR_buffer_puts(codec, b->u.stream.data,
+                                                  b->u.stream.length);
                        break;
                default:
                        ret = CORBA_FALSE;
@@ -355,7 +355,7 @@ err:
 
 
 CORBA_boolean
-fres_container_ptr_serialize(CDR_Codec *codec, const fres_container_ptr *container_ptr)
+fres_container_ptr_serialize(FORB_CDR_Codec *codec, const fres_container_ptr *container_ptr)
 {
        //CORBA_long l;
        CORBA_long count;
@@ -385,8 +385,8 @@ err:
 }
 
 CORBA_boolean
-fres_container_ptr_deserialize(CDR_Codec *codec,
-                            fres_container_ptr *container)
+fres_container_ptr_deserialize(FORB_CDR_Codec *codec,
+                              fres_container_ptr *container)
 {
        CORBA_boolean ret;
        struct fres_container *c;
@@ -406,13 +406,13 @@ fres_container_ptr_deserialize(CDR_Codec *codec,
                if (!CORBA_short_deserialize(codec, &type_short)) goto free_err;
                if (!CORBA_short_deserialize(codec, &flags)) goto free_err;
                if (!CORBA_long_deserialize(codec, &length)) goto free_err;
-               CDR_get_align(codec, 8); /* All blocks are 8 byte aligned */
+               FORB_CDR_get_align(codec, 8); /* All blocks are 8 byte aligned */
 
                type = type_short;
                if (!FRES_BLOCK_TYPE_VALID(type)) goto free_err;
                if (block_registry[type] &&
                    block_registry[type]->deserialize) {
-                       CDR_Endianness endian;
+                       FORB_CDR_Endianness endian;
                        void *block;
                        block = malloc(block_registry[type]->size);
                        if (!block) goto free_err;
@@ -432,7 +432,7 @@ fres_container_ptr_deserialize(CDR_Codec *codec,
                        if (!bs->data) goto free_err;
                        bs->flags = flags;
                        bs->length = length;
-                       CDR_buffer_gets(codec, bs->data, length);
+                       FORB_CDR_buffer_gets(codec, bs->data, length);
                }
        }
 

diff --git a/fres/contract/fres_container.h b/fres/contract/fres_container.h
index d515882daa0c37fe325d3d091239c48f6c18bdd3..153fedee3732c48abff36c5cce72774ffe61b34d 100644 (file)
--- a/fres/contract/fres_container.h
+++ b/fres/contract/fres_container.h
@@ -40,8 +40,8 @@ enum fres_block_type {
        FRES_NUM_BLOCKS
 };
 
-typedef CORBA_boolean (fres_block_serialize_fnc_t)(CDR_Codec *codec, const void *block_data);
-typedef CORBA_boolean (fres_block_deserialize_fnc_t)(CDR_Codec *codec, void **block_data);
+typedef CORBA_boolean (fres_block_serialize_fnc_t)(FORB_CDR_Codec *codec, const void *block_data);
+typedef CORBA_boolean (fres_block_deserialize_fnc_t)(FORB_CDR_Codec *codec, void **block_data);
 
 /**
  * Description of contract blocks.

diff --git a/fres/contract/fres_container_type.h b/fres/contract/fres_container_type.h
index 53f62ccc325ec9aded945ba86f73615b04865e66..b8fce6214dd125a9e1d130a4083cb093c95503ff 100644 (file)
--- a/fres/contract/fres_container_type.h
+++ b/fres/contract/fres_container_type.h
@@ -10,11 +10,11 @@
 typedef struct fres_container *fres_container_ptr;
 
 CORBA_boolean
-fres_container_ptr_serialize(CDR_Codec *codec,
-                          const fres_container_ptr *container);
+fres_container_ptr_serialize(FORB_CDR_Codec *codec,
+                            const fres_container_ptr *container);
 
 CORBA_boolean
-fres_container_ptr_deserialize(CDR_Codec *codec,
-                            fres_container_ptr *container);
+fres_container_ptr_deserialize(FORB_CDR_Codec *codec,
+                              fres_container_ptr *container);
 
 #endif

diff --git a/fres/contract/fres_contract.c b/fres/contract/fres_contract.c
index 4605ea623bb8f2c795a0623c4fa813cd5d5ebb7e..d95ff7133a6b54686be4796bb961bb4fd780d767 100644 (file)
--- a/fres/contract/fres_contract.c
+++ b/fres/contract/fres_contract.c
@@ -63,8 +63,8 @@ err:
 }
 
 CORBA_boolean
-fres_contract_ptr_serialize(CDR_Codec *codec,
-                         const fres_contract_ptr *contract)
+fres_contract_ptr_serialize(FORB_CDR_Codec *codec,
+                           const fres_contract_ptr *contract)
 {
        CORBA_boolean cb;
        cb = fres_contract_id_t_serialize(codec, &(*contract)->id);
@@ -77,8 +77,8 @@ err:
 }
 
 CORBA_boolean
-fres_contract_ptr_deserialize(CDR_Codec *codec,
-                           fres_contract_ptr *contract)
+fres_contract_ptr_deserialize(FORB_CDR_Codec *codec,
+                             fres_contract_ptr *contract)
 {
        CORBA_boolean cb;
        struct fres_contract *c;

diff --git a/fres/contract/fres_contract_ser.h b/fres/contract/fres_contract_ser.h
index 1e11fe7b7cdfb9cc910c780e1f0e4a8ae6e4fdd3..f2741fdb9afb126c459a23f84c8cee8b01a0b60f 100644 (file)
--- a/fres/contract/fres_contract_ser.h
+++ b/fres/contract/fres_contract_ser.h
@@ -17,12 +17,12 @@
 #include "fres_contract_type.h"
 
 CORBA_boolean
-fres_contract_ptr_serialize(CDR_Codec *codec,
-                         const fres_contract_ptr *contract);
+fres_contract_ptr_serialize(FORB_CDR_Codec *codec,
+                           const fres_contract_ptr *contract);
 
 CORBA_boolean
-fres_contract_ptr_deserialize(CDR_Codec *codec,
-                           fres_contract_ptr *contract);
+fres_contract_ptr_deserialize(FORB_CDR_Codec *codec,
+                             fres_contract_ptr *contract);
 
 void fres_contract_ptr_free(fres_contract_ptr contract);
 

diff --git a/fres/contract/idl_native.h b/fres/contract/idl_native.h
index 646057b0d160d2ee45c95b03e3b3a713b6419c86..51efbe4bd3d2dd0c181f74e373337dba2b9dc81f 100644 (file)
--- a/fres/contract/idl_native.h
+++ b/fres/contract/idl_native.h
@@ -7,7 +7,7 @@
 #include <forb/cdr.h>
 
 static inline CORBA_boolean
-fosa_rel_time_t_serialize(CDR_Codec *codec, const struct timespec *ts)                 
+fosa_rel_time_t_serialize(FORB_CDR_Codec *codec, const struct timespec *ts)                    
 { 
        CORBA_long sec = ts->tv_sec;
        CORBA_long nsec = ts->tv_nsec;
@@ -17,7 +17,7 @@ fosa_rel_time_t_serialize(CDR_Codec *codec, const struct timespec *ts)
 }
        
 static inline CORBA_boolean
-fosa_rel_time_t_deserialize(CDR_Codec *codec, struct timespec *ts)
+fosa_rel_time_t_deserialize(FORB_CDR_Codec *codec, struct timespec *ts)
 {
        CORBA_long sec, nsec;
        if (!CORBA_long_deserialize(codec, &sec)) return CORBA_FALSE;

diff --git a/fres/contract/tests/contract.c b/fres/contract/tests/contract.c
index ec431e50f20f4fc812f0ce1620537c28d2f665fb..21e252ab9d449f7cc72fb7d9a06c39d68d7886fc 100644 (file)
--- a/fres/contract/tests/contract.c
+++ b/fres/contract/tests/contract.c
@@ -77,10 +77,10 @@ int main()
        fres_contract_destroy(c2);
 
        {
-               CDR_Codec codec;
+               FORB_CDR_Codec codec;
                CORBA_boolean cb;
-               CDR_codec_init_static(&codec, NULL);
-               cb = CDR_buffer_init(&codec, 4000, 0);
+               FORB_CDR_codec_init_static(&codec, NULL);
+               cb = FORB_CDR_buffer_init(&codec, 4000, 0);
                if (!cb) error(1, errno, "CDR_buffer_init");
                
                cb = fres_contract_ptr_serialize(&codec, &c);