[certi-cvs] certi/libHLA MsgBuffer.h MsgBuffer.c

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/06/10 14:39:33

Modified files:
        libHLA         : MsgBuffer.h MsgBuffer.c 

Log message:
        Avoid duplicate symbols.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/MsgBuffer.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/MsgBuffer.c?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: MsgBuffer.h
===================================================================
RCS file: /sources/certi/certi/libHLA/MsgBuffer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MsgBuffer.h 10 Jun 2011 14:05:30 -0000      1.1
+++ MsgBuffer.h 10 Jun 2011 14:39:33 -0000      1.2
@@ -329,15 +329,10 @@
 
 #define MB_DECLARE_SIGNED(type)                \
         MB_EXPORT int32_t                     \
-        MB_write_##type##s(MsgBuffer_t* msg,  type##_t* data, uint32_t n) {    
 \
-    return MB_write_u##type##s(msg, (u##type##_t*)(data),n);  \
-}                           \
+        MB_write_##type##s(MsgBuffer_t* msg,  type##_t* data, uint32_t n);\
 \
 MB_EXPORT int32_t                     \
-MB_read_##type##s(MsgBuffer_t* msg, type##_t* data, uint32_t n) {        \
-    return MB_read_u##type##s(msg, (u##type##_t*)(data),n); \
-}                               \
-
+MB_read_##type##s(MsgBuffer_t* msg, type##_t* data, uint32_t n);
 
 #define MB_DECLARE_SINGLE_READ_WRITE(type,suffix)     \
         MB_DECLARE_SINGLE_READ_WRITE_(type,type##suffix)
@@ -345,23 +340,14 @@
 #define MB_DECLARE_SINGLE_READ_WRITE2(type)     \
         MB_DECLARE_SINGLE_READ_WRITE_(type,type)
 
-
 #define MB_DECLARE_SINGLE_READ_WRITE_(type,datatype)     \
-        int32_t                     \
-        MB_write_##type(MsgBuffer_t* msg,  datatype data) {     \
-    return MB_write_##type##s(msg, &data,1);    \
-}                           \
+        MB_EXPORT int32_t                     \
+        MB_write_##type(MsgBuffer_t* msg,  datatype data);\
 \
 MB_EXPORT int32_t                     \
-MB_read_##type(MsgBuffer_t* msg, datatype* data) {       \
-    return MB_read_##type##s(msg,data,1);  \
-}                                    \
+MB_read_##type(MsgBuffer_t* msg, datatype* data) ;\
 \
-MB_EXPORT datatype MB_get_##type(MsgBuffer_t* msg) {\
-    datatype retval;     \
-    MB_read_##type##s(msg,&retval,1);\
-    return retval; \
-} 
+MB_EXPORT datatype MB_get_##type(MsgBuffer_t* msg);
 
 MB_EXPORT
 int32_t
@@ -377,15 +363,11 @@
 
 MB_EXPORT
 int32_t
-MB_write_chars(MsgBuffer_t* msg,  char* data, uint32_t n) {
-    return MB_write_uint8s(msg,(uint8_t*)(data),n);
-}
+MB_write_chars(MsgBuffer_t* msg,  char* data, uint32_t n);
 
 MB_EXPORT
 int32_t
-MB_read_chars(MsgBuffer_t* msg, char* data, uint32_t n) {
-    return MB_read_uint8s(msg,(uint8_t*)(data),n);
-}
+MB_read_chars(MsgBuffer_t* msg, char* data, uint32_t n);
 MB_DECLARE_SINGLE_READ_WRITE2(char)
 
 #define MB_write_bytes  MB_write_chars
@@ -459,19 +441,11 @@
 
 MB_EXPORT
 int32_t
-MB_write_bool(MsgBuffer_t* msg,  bool_t toggle) {
-    if(toggle) {
-        return MB_write_uint8(msg,1);
-    } else {
-        return MB_write_uint8(msg,0);
-    }
-}
+MB_write_bool(MsgBuffer_t* msg,  bool_t toggle);
 
 MB_EXPORT
 bool_t
-MB_read_bool(MsgBuffer_t* msg) {
-    return (1==MB_get_uint8(msg));
-}
+MB_read_bool(MsgBuffer_t* msg);
 
 /**
  * Update the reserved bytes area.

Index: MsgBuffer.c
===================================================================
RCS file: /sources/certi/certi/libHLA/MsgBuffer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MsgBuffer.c 10 Jun 2011 14:05:30 -0000      1.1
+++ MsgBuffer.c 10 Jun 2011 14:39:33 -0000      1.2
@@ -24,6 +24,80 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#define MB_IMPLEMENT_SIGNED(type)                \
+        int32_t                     \
+        MB_write_##type##s(MsgBuffer_t* msg,  type##_t* data, uint32_t n) {    
 \
+    return MB_write_u##type##s(msg, (u##type##_t*)(data),n);  \
+}                           \
+\
+int32_t                     \
+MB_read_##type##s(MsgBuffer_t* msg, type##_t* data, uint32_t n) {        \
+    return MB_read_u##type##s(msg, (u##type##_t*)(data),n); \
+}                               \
+
+#define MB_IMPLEMENT_SINGLE_READ_WRITE(type,suffix)     \
+        MB_IMPLEMENT_SINGLE_READ_WRITE_(type,type##suffix)
+
+#define MB_IMPLEMENT_SINGLE_READ_WRITE2(type)     \
+        MB_IMPLEMENT_SINGLE_READ_WRITE_(type,type)
+
+#define MB_IMPLEMENT_SINGLE_READ_WRITE_(type,datatype)     \
+        int32_t                     \
+        MB_write_##type(MsgBuffer_t* msg,  datatype data) {     \
+    return MB_write_##type##s(msg, &data,1);    \
+}                           \
+\
+int32_t                     \
+MB_read_##type(MsgBuffer_t* msg, datatype* data) {       \
+    return MB_read_##type##s(msg,data,1);  \
+}                                    \
+\
+datatype MB_get_##type(MsgBuffer_t* msg) {\
+    datatype retval;     \
+    MB_read_##type##s(msg,&retval,1);\
+    return retval; \
+}
+
+MB_IMPLEMENT_SINGLE_READ_WRITE(uint8,_t)
+MB_IMPLEMENT_SIGNED(int8)
+MB_IMPLEMENT_SINGLE_READ_WRITE(int8,_t)
+MB_IMPLEMENT_SINGLE_READ_WRITE2(char)
+MB_IMPLEMENT_SINGLE_READ_WRITE(uint16,_t)
+MB_IMPLEMENT_SIGNED(int16)
+MB_IMPLEMENT_SINGLE_READ_WRITE(int16,_t)
+MB_IMPLEMENT_SINGLE_READ_WRITE(uint32,_t)
+MB_IMPLEMENT_SIGNED(int32)
+MB_IMPLEMENT_SINGLE_READ_WRITE(int32,_t)
+MB_IMPLEMENT_SINGLE_READ_WRITE(uint64,_t)
+MB_IMPLEMENT_SIGNED(int64)
+MB_IMPLEMENT_SINGLE_READ_WRITE(int64,_t)
+MB_IMPLEMENT_SINGLE_READ_WRITE2(float)
+MB_IMPLEMENT_SINGLE_READ_WRITE2(double)
+
+int32_t
+MB_write_chars(MsgBuffer_t* msg,  char* data, uint32_t n) {
+    return MB_write_uint8s(msg,(uint8_t*)(data),n);
+}
+
+int32_t
+MB_read_chars(MsgBuffer_t* msg, char* data, uint32_t n) {
+    return MB_read_uint8s(msg,(uint8_t*)(data),n);
+}
+
+int32_t
+MB_write_bool(MsgBuffer_t* msg,  bool_t toggle) {
+    if(toggle) {
+        return MB_write_uint8(msg,1);
+    } else {
+        return MB_write_uint8(msg,0);
+    }
+}
+
+bool_t
+MB_read_bool(MsgBuffer_t* msg) {
+    return (1==MB_get_uint8(msg));
+}
+
 static void MB_initialize(MsgBuffer_t* msg) {
     assert(msg);
     msg->buffer = NULL;