[ Jira id - ODUHIGH-593 ] Pack and unpack function nomenclature correction

[o-du/l2.git] / src / mt / ss_pack.c

diff --git a/src/mt/ss_pack.c b/src/mt/ss_pack.c
index 831c9b1..d02f690 100644 (file)
--- a/src/mt/ss_pack.c
+++ b/src/mt/ss_pack.c
@@ -88,17 +88,11 @@
 *
 */
 
-#ifdef ANSI
 S16 SPkS8
 (
 S8 val,                     /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkS8(val, mBuf)
-S8 val;                     /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16 ret;                 /* return code */
    ret = SAddPreMsg((Data) val, mBuf);
@@ -113,7 +107,7 @@ Buffer *mBuf;               /* message buffer */
 \f  
 /*
 *
-*       Fun:   oduUnpackUInt8
+*       Fun:   oduPackUInt8
 *
 *       Desc:  This function packs an unsigned 8 bit value into a message.
 *
@@ -127,17 +121,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
-S16 oduUnpackUInt8
+S16 oduPackUInt8
 (
-U8 val,                     /* value */
+uint8_t val,                     /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduUnpackUInt8(val, mBuf)
-U8 val;                     /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16 ret;                 /* return code */
    ret = SAddPreMsg((Data) val, mBuf);
@@ -146,7 +134,7 @@ Buffer *mBuf;               /* message buffer */
       SSLOGERROR(ERRCLS_ADD_RES, ESS243, (ErrVal)ret, "SAddPreMsg() failed");
 #endif
    return (ret);
-} /* end of oduUnpackUInt8 */
+} /* end of oduPackUInt8 */
 \f  
 /*
 *
@@ -164,17 +152,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkS16
 (
 S16 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkS16(val, mBuf)
-S16 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data pkArray[2];         /* array for packing */
    S16 ret;                 /* return code */
@@ -197,7 +179,7 @@ Buffer *mBuf;               /* message buffer */
 \f  
 /*
 *
-*       Fun:   oduUnpackUInt16
+*       Fun:   oduPackUInt16
 *
 *       Desc:  This function packs an unsigned 16 bit value into a message.
 *
@@ -211,17 +193,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
-S16 oduUnpackUInt16
+S16 oduPackUInt16
 (
-U16 val,                    /* value */
+uint16_t val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduUnpackUInt16(val, mBuf)
-U16 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data pkArray[2];         /* array for packing */
    S16 ret;                 /* return code */
@@ -239,7 +215,7 @@ Buffer *mBuf;               /* message buffer */
       SSLOGERROR(ERRCLS_ADD_RES, ESS245, (ErrVal)ret, "SAddPreMsgMult() failed");
 #endif
    return (ret);
-} /* end of oduUnpackUInt16 */
+} /* end of oduPackUInt16 */
   
 \f  
 /*
@@ -258,34 +234,28 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkS32
 (
 S32 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkS32(val, mBuf)
-S32 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
-   U16 tmp;                 /* temporary value */
+   uint16_t tmp;                 /* temporary value */
    Data pkArray[4];         /* packing array */
    S16 ret;                 /* return code */
   
 #ifndef FCSPKINT        /* backward compatibility, packing order */
-   tmp = (U16) GetHiWord(val);
+   tmp = (uint16_t) GetHiWord(val);
    pkArray[0] = (Data) GetHiByte(tmp);
    pkArray[1] = (Data) GetLoByte(tmp);
-   tmp = (U16) GetLoWord(val);
+   tmp = (uint16_t) GetLoWord(val);
    pkArray[2] = (Data) GetHiByte(tmp);
    pkArray[3] = (Data) GetLoByte(tmp);
 #else                   /* forward compatibility, packing order */
-   tmp = (U16) GetHiWord(val);
+   tmp = (uint16_t) GetHiWord(val);
    pkArray[3] = (Data) GetHiByte(tmp);
    pkArray[2] = (Data) GetLoByte(tmp);
-   tmp = (U16) GetLoWord(val);
+   tmp = (uint16_t) GetLoWord(val);
    pkArray[1] = (Data) GetHiByte(tmp);
    pkArray[0] = (Data) GetLoByte(tmp);
 #endif
@@ -300,7 +270,7 @@ Buffer *mBuf;               /* message buffer */
 \f  
 /*
 *
-*       Fun:   oduUnpackUInt32
+*       Fun:   oduPackUInt32
 *
 *       Desc:  This function packs an unsigned 32 bit value into a message.
 *
@@ -314,34 +284,28 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
-S16 oduUnpackUInt32
+S16 oduPackUInt32
 (
-U32 val,                    /* value */
+uint32_t val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduUnpackUInt32(val, mBuf)
-U32 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
-   U16 tmp;                 /* temporary value */
+   uint16_t tmp;                 /* temporary value */
    Data pkArray[4];         /* packing array */
    S16 ret;                 /* return code */
   
 #ifndef FCSPKINT        /* backward compatibility, packing order */
-   tmp = (U16) GetHiWord(val);
+   tmp = (uint16_t) GetHiWord(val);
    pkArray[0] = (Data) GetHiByte(tmp);
    pkArray[1] = (Data) GetLoByte(tmp);
-   tmp = (U16) GetLoWord(val);
+   tmp = (uint16_t) GetLoWord(val);
    pkArray[2] = (Data) GetHiByte(tmp);
    pkArray[3] = (Data) GetLoByte(tmp);
 #else                   /* forward compatibility, packing order */
-   tmp = (U16) GetHiWord(val);
+   tmp = (uint16_t) GetHiWord(val);
    pkArray[3] = (Data) GetHiByte(tmp);
    pkArray[2] = (Data) GetLoByte(tmp);
-   tmp = (U16) GetLoWord(val);
+   tmp = (uint16_t) GetLoWord(val);
    pkArray[1] = (Data) GetHiByte(tmp);
    pkArray[0] = (Data) GetLoByte(tmp);
 #endif
@@ -351,7 +315,7 @@ Buffer *mBuf;               /* message buffer */
       SSLOGERROR(ERRCLS_ADD_RES, ESS247, (ErrVal)ret, "SAddPreMsgMult() failed");
 #endif
    return (ret);
-} /* end of oduUnpackUInt32 */
+} /* end of oduPackUInt32 */
 
 /*ss038.103  1. Added Floating point support*/
 #ifdef SS_FLOAT
@@ -371,17 +335,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkF32
 (
 F32 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkF32(val, mBuf)
-F32 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16  ret;                /* return code */
    S8   tmpArray[15];       /* temporary array */
@@ -428,17 +386,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkF64
 (
 F64 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkF64(val, mBuf)
-F64 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    S16  ret;                /* return code */
@@ -486,17 +438,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkS8
 (
 S8 *val,                    /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkS8(val, mBuf)
-S8 *val;                    /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data tmp;                /* temporary value */
    S16 ret;                 /* return code */
@@ -523,7 +469,7 @@ Buffer *mBuf;               /* message buffer */
 \f  
 /*
 *
-*       Fun:   oduPackUInt8
+*       Fun:   oduUnpackUInt8
 *
 *       Desc:  This function unpacks an unsigned 8 bit value from a message.
 *
@@ -535,17 +481,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
-S16 oduPackUInt8
+S16 oduUnpackUInt8
 (
-U8 *val,                    /* pointer to value */
+uint8_t *val,                    /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduPackUInt8(val, mBuf)
-U8 *val;                    /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data tmp;                /* temporary value */
    S16 ret;                 /* return code */
@@ -555,7 +495,7 @@ Buffer *mBuf;               /* message buffer */
    /* check data pointer */
    if (!val)
    {
-      SSLOGERROR(ERRCLS_INT_PAR, ESS252, ERRZERO, "oduPackUInt8 : Null value");
+      SSLOGERROR(ERRCLS_INT_PAR, ESS252, ERRZERO, "oduUnpackUInt8 : Null value");
       return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
@@ -565,9 +505,9 @@ Buffer *mBuf;               /* message buffer */
    if (ret != ROK)
       SSLOGERROR(ERRCLS_DEBUG, ESS253, (ErrVal)ret, "SRemPreMsg() failed");
 #endif
-   *val = (U8) tmp;
+   *val = (uint8_t) tmp;
    return (ret);
-} /* end of oduPackUInt8 */
+} /* end of oduUnpackUInt8 */
 \f  
 /*
 *
@@ -583,19 +523,13 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkS16
 (
 S16 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkS16(val, mBuf)
-S16 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
-   U16 tmp16;               /* temporary value */
+   uint16_t tmp16;               /* temporary value */
    Data unpkArray[2];       /* unpacking array */
    S16 ret;                 /* return code */
 
@@ -616,11 +550,11 @@ Buffer *mBuf;               /* message buffer */
 #endif
    tmp16 = 0; 
 #ifndef FCSPKINT            /* backward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]);
 #else                       /* forward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]);
 #endif
    *val = (S16) tmp16;
    return (ret);
@@ -629,7 +563,7 @@ Buffer *mBuf;               /* message buffer */
 \f  
 /*
 *
-*       Fun:   oduPackUInt16
+*       Fun:   oduUnpackUInt16
 *
 *       Desc:  This function unpacks an unsigned 16 bit value from a message.
 *
@@ -641,19 +575,13 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
-S16 oduPackUInt16
+S16 oduUnpackUInt16
 (
-U16 *val,                   /* pointer to value */
+uint16_t *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduPackUInt16(val, mBuf)
-U16 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
-   U16 tmp16;               /* temporary value */
+   uint16_t tmp16;               /* temporary value */
    Data unpkArray[2];       /* unpacking array */
    S16 ret;                 /* return code */
 
@@ -662,7 +590,7 @@ Buffer *mBuf;               /* message buffer */
    /* check data pointer */
    if (!val)
    {
-      SSLOGERROR(ERRCLS_INT_PAR, ESS256, ERRZERO, "oduPackUInt16 : Null value");
+      SSLOGERROR(ERRCLS_INT_PAR, ESS256, ERRZERO, "oduUnpackUInt16 : Null value");
       return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
@@ -674,15 +602,15 @@ Buffer *mBuf;               /* message buffer */
 #endif
    tmp16 = 0; 
 #ifndef FCSPKINT            /* backward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]);
 #else                       /* forward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]);
 #endif
    *val = tmp16;
    return (ret);
-} /* end of oduPackUInt16 */
+} /* end of oduUnpackUInt16 */
   
 \f  
 /*
@@ -699,20 +627,14 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkS32
 (
 S32 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkS32(val, mBuf)
-S32 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
-   U16 tmp16;               /* temporary value */
-   U32 tmp32;               /* temporary value */
+   uint16_t tmp16;               /* temporary value */
+   uint32_t tmp32;               /* temporary value */
    Data unpkArray[4];       /* unpacking array */
    S16 ret;                 /* return code */
 
@@ -734,19 +656,19 @@ Buffer *mBuf;               /* message buffer */
    tmp16 = 0;
    tmp32 = 0; 
 #ifndef FCSPKINT            /* backward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[3]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[2]);
-   tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16);
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]);
-   tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[3]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[2]);
+   tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]);
+   tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16);
 #else                       /* forward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]);
-   tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16);
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[2]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[3]);
-   tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]);
+   tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[2]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[3]);
+   tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16);
 #endif
    *val = (S32) tmp32;
    return (ret);
@@ -755,7 +677,7 @@ Buffer *mBuf;               /* message buffer */
 \f  
 /*
 *
-*       Fun:   oduPackUInt32
+*       Fun:   oduUnpackUInt32
 *
 *       Desc:  This function unpacks an unsigned 32 bit value from a message.
 *
@@ -767,20 +689,14 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
-S16 oduPackUInt32
+S16 oduUnpackUInt32
 (
-U32 *val,                   /* pointer to value */
+uint32_t *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduPackUInt32(val, mBuf)
-U32 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
-   U16 tmp16;               /* temporary value */
-   U32 tmp32;               /* temporary value */
+   uint16_t tmp16;               /* temporary value */
+   uint32_t tmp32;               /* temporary value */
    Data unpkArray[4];       /* unpacking array */
 #ifdef ERRCLASS
    S16 ret;                 /* return code */
@@ -791,7 +707,7 @@ Buffer *mBuf;               /* message buffer */
    /* check data pointer */
    if (!val)
    {
-      SSLOGERROR(ERRCLS_INT_PAR, ESS260, ERRZERO, "oduPackUInt32 : Null value");
+      SSLOGERROR(ERRCLS_INT_PAR, ESS260, ERRZERO, "oduUnpackUInt32 : Null value");
       return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
@@ -805,23 +721,23 @@ Buffer *mBuf;               /* message buffer */
    tmp16 = 0;
    tmp32 = 0; 
 #ifndef FCSPKINT            /* backward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[3]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[2]);
-   tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16);
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]);
-   tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[3]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[2]);
+   tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]);
+   tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16);
 #else                       /* forward compatibility, packing order */
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]);
-   tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16);
-   tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[2]);
-   tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[3]);
-   tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]);
+   tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16);
+   tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[2]);
+   tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[3]);
+   tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16);
 #endif
    *val = tmp32;
    return (ret);
-} /* end of oduPackUInt32 */
+} /* end of oduUnpackUInt32 */
 
 /*ss038.103  1. Added Floating point support*/
 #ifdef SS_FLOAT
@@ -839,17 +755,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkF32
 (
 F32 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkF32(val, mBuf)
-F32 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16 ret;                 /* return code */
    S8 tmpArray[15];         /* temporary array */
@@ -903,17 +813,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkF64
 (
 F64 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkF64(val, mBuf)
-F64 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    S16 ret;                 /* return code */