]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
warnings cleanup.
authorMichael Jerris <mike@jerris.com>
Mon, 21 May 2007 19:23:01 +0000 (19:23 +0000)
committerMichael Jerris <mike@jerris.com>
Mon, 21 May 2007 19:23:01 +0000 (19:23 +0000)
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@72 a93c3328-9c30-0410-af19-c9cd2b2d52af

libs/openzap/src/isdn/Q931.c
libs/openzap/src/isdn/Q931StateNT.c
libs/openzap/src/isdn/Q931StateTE.c
libs/openzap/src/isdn/Q931api.c
libs/openzap/src/isdn/include/Q931.h

index 42b76ecdb3795c70b87a79bc7ba10be255f3116f..ed736284d036e06c7499fdad1fed32dbb2ae2549 100644 (file)
@@ -548,14 +548,14 @@ L3INT     Q931GetCallState(Q931_TrunkInfo *pTrunk, L3INT iCRV)
                 callindex   call index.\r
                 iTimer      timer id\r
 *****************************************************************************/\r
-L3INT Q931StartTimer(Q931_TrunkInfo *pTrunk, L3INT callIndex, L3INT iTimerID)\r
+L3INT Q931StartTimer(Q931_TrunkInfo *pTrunk, L3INT callIndex, L3USHORT iTimerID)\r
 {\r
     pTrunk->call[callIndex].Timer   = Q931GetTime();  \r
     pTrunk->call[callIndex].TimerID = iTimerID;\r
     return 0;\r
 }\r
 \r
-L3INT Q931StopTimer(Q931_TrunkInfo *pTrunk, L3INT callindex, L3INT iTimerID)\r
+L3INT Q931StopTimer(Q931_TrunkInfo *pTrunk, L3INT callindex, L3USHORT iTimerID)\r
 {\r
     if(pTrunk->call[callindex].TimerID == iTimerID)\r
         pTrunk->call[callindex].TimerID = 0;\r
@@ -571,7 +571,7 @@ L3INT Q931SetState(Q931_TrunkInfo *pTrunk, L3INT callIndex, L3INT iState)
 \r
 L3ULONG Q931GetTime()\r
 {\r
-    L3ULONG tNow;\r
+    L3ULONG tNow = 0;\r
     static L3ULONG tLast={0};\r
     if(Q931GetTimeProc != NULL)\r
     {\r
index 21adcfa05b3710bb9f8abd204e6a3cbc7fa9acdb..fc245902bbad7c8710f3ac4a724bbe3f96d43922 100644 (file)
@@ -347,11 +347,15 @@ L3INT Q931ProcSetupNT(Q931_TrunkInfo *pTrunk, L3UCHAR * buf, L3INT iFrom)
                return ret;\r
                }\r
 \r
+#if 0\r
+               /* TODO: Unreachable code??? */\r
         /* Set state U6 */\r
         Q931SetState(pTrunk, callIndex, Q931_U6);\r
 \r
         Q931StartTimer(pTrunk, callIndex, 303);\r
-    }\r
+#endif\r
+\r
+       }\r
 \r
        return rc;\r
 }\r
index f2a35074733ae108c894cbd5e33b5e371cd7e1bf..745d0bc790509c894c359219b9d00f9b6d0f2ec0 100644 (file)
@@ -428,11 +428,13 @@ L3INT Q931ProcSetupTE(Q931_TrunkInfo *pTrunk, L3UCHAR * buf, L3INT iFrom)
                Q931Disconnect(pTrunk, iFrom, pMes->CRV, 81);\r
                return ret;\r
                }\r
-\r
+#if 0\r
+               /* TODO: Unreachable code??? */\r
         /* Set state U6 */\r
         Q931SetState(pTrunk, callIndex, Q931_U6);\r
 \r
         Q931StartTimer(pTrunk, callIndex, 303);\r
+#endif\r
     }\r
 \r
        return rc;\r
index 079ae8301cd4971a459c179612b078f0e4086b5d..f1da2c9aa01c7cb46090b56aa04e3438e5c74a33 100644 (file)
@@ -234,10 +234,11 @@ L3UCHAR * Q931GetIEBuf(L3UCHAR *pm)
     case Q931mes_CONGESTION_CONTROL   :\r
                trampoline(Q931mes_CongestionControl);\r
         break;\r
-\r
-//    case Q931mes_FACILITY           :\r
-//             trampoline(Q931mes_Facility);\r
-//        break;\r
+#if 0\r
+    case Q931mes_FACILITY           :\r
+               trampoline(Q931mes_Facility);\r
+        break;\r
+#endif\r
 \r
     case Q931mes_INFORMATION          :\r
                trampoline(Q931mes_Information);\r
@@ -247,9 +248,11 @@ L3UCHAR * Q931GetIEBuf(L3UCHAR *pm)
                trampoline(Q931mes_Notify);\r
         break;\r
 \r
-//    case Q931mes_REGISTER           :\r
-//             trampoline(Q931mes_Register);\r
-//        break;\r
+#if 0\r
+    case Q931mes_REGISTER           :\r
+               trampoline(Q931mes_Register);\r
+        break;\r
+#endif\r
 \r
     case Q931mes_STATUS               :\r
                trampoline(Q931mes_Status);\r
@@ -301,7 +304,7 @@ ie Q931AppendIE( L3UCHAR *pm, L3UCHAR *pi)
 \r
        L3UCHAR *pBuf = Q931GetIEBuf(pm);\r
        L3INT Off = pMes->Size - (pBuf - pm);\r
-       IE = Off | 0x8000;\r
+       IE = (ie)(Off | 0x8000);\r
 \r
        memcpy(&pm[pMes->Size], pi, iISize);\r
 \r
@@ -577,7 +580,9 @@ L3INT Q931InitIELLComp(Q931ie_LLComp * pIE)
        pIE->Layer3Ident        = 0;        /* Layer 3 ident                        */\r
        pIE->OptL3Info          = 0;        /* Optional layer 3 protocol info.      */\r
        pIE->ModeL3                     = 0;        /* Mode of operation                    */\r
-//     pIE->ModeX25op          = 0;        /* Mode of operation X.25               */\r
+#if 0\r
+       pIE->ModeX25op          = 0;        /* Mode of operation X.25               */\r
+#endif\r
        pIE->DefPackSize        = 0;        /* Default packet size                  */\r
        pIE->PackWinSize        = 0;        /* Packet window size                   */\r
        pIE->AddL3Info          = 0;        /* Additional Layer 3 protocol info     */\r
@@ -595,20 +600,40 @@ L3INT Q931InitIEHLComp(Q931ie_HLComp * pIE)
 \r
 L3INT Q931ProcUnknownMessage(Q931_TrunkInfo *pTrunk,L3UCHAR * b, L3INT iFrom)\r
 {\r
+       /* TODO:  Unhandled paramaters */\r
+       (void)pTrunk;\r
+       (void)b;\r
+       (void)iFrom;\r
+\r
     return 0;\r
 }\r
 \r
 L3INT Q931ProcUnexpectedMessage(Q931_TrunkInfo *pTrunk,L3UCHAR * b, L3INT iFrom)\r
 {\r
+       /* TODO:  Unhandled paramaters */\r
+       (void)pTrunk;\r
+       (void)b;\r
+       (void)iFrom;\r
+\r
     return 0;\r
 }\r
 \r
 L3INT Q931Disconnect(Q931_TrunkInfo *pTrunk, L3INT iTo, L3INT iCRV, L3INT iCause)\r
 {\r
+       /* TODO:  Unhandled paramaters */\r
+       (void)pTrunk;\r
+       (void)iTo;\r
+       (void)iCRV;\r
+       (void)iCause;\r
+\r
     return 0;\r
 }\r
 \r
 L3INT Q931ReleaseComplete(Q931_TrunkInfo *pTrunk, L3INT iTo)\r
 {\r
-    return 0;\r
+       /* TODO:  Unhandled paramaters */\r
+       (void)pTrunk;\r
+       (void)iTo;\r
+\r
+       return 0;\r
 }\r
index 8e7b0066b798bf3c70666fb2fd397a9667de1843..0ed40e5147119e9e7840675b811aaaf7463ef5aa 100644 (file)
@@ -1348,7 +1348,7 @@ typedef struct
     L3UINT                     Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
 }Q931mes_Header;\r
 \r
 /*****************************************************************************\r
@@ -1364,7 +1364,7 @@ typedef struct
     L3UINT                     Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
 \r
     ie              Shift;\r
     ie              MoreData;\r
@@ -1424,7 +1424,7 @@ typedef struct
     L3UINT                     Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              BearerCap;      /* Bearer Capability                    */\r
     ie              ChanID;         /* Channel Identification               */\r
     ie              ProgInd;        /* Progress Indicator                   */\r
@@ -1445,7 +1445,7 @@ typedef struct
     L3UINT                     Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              BearerCap;      /* Bearer Capability                    */\r
     ie              ChanID;         /* Channel Identification               */\r
     ie              ProgInd;        /* Progress Indicator                   */\r
@@ -1465,7 +1465,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              BearerCap;      /* Bearer Capability                    */\r
     ie              ChanID;         /* Channel Identification               */\r
     ie              ProgInd;        /* Progress Indicator                   */\r
@@ -1488,7 +1488,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Display;        /* Display                              */\r
     ie              Signal;         /* Signal                               */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
@@ -1505,7 +1505,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Cause;          /* Cause                                */\r
     ie              ProgInd;        /* Progress Indicator                   */\r
     ie              Display;        /* Display                              */\r
@@ -1527,7 +1527,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              SendComplete;   /* Sending Complete                     */\r
     ie              Display;        /* Display                              */\r
     ie              KeypadFac;      /* Keypad facility                      */\r
@@ -1550,7 +1550,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              BearerCap;      /* Bearer Capability                    */\r
     ie              NotifInd;       /* Notification Indicator               */\r
     ie              Display;        /* Display                              */\r
@@ -1568,7 +1568,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              BearerCap;      /* Bearer Capability                    */\r
     ie              Cause;          /* Cause                                */\r
     ie              ProgInd;        /* Progress Indicator                   */\r
@@ -1588,7 +1588,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Cause;          /* Cause                                */\r
     ie              Display;        /* Display                              */\r
     ie              Signal;         /* Signal                               */\r
@@ -1609,7 +1609,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Cause;          /* Cause                                */\r
     ie              Display;        /* Display                              */\r
     ie              Signal;         /* Signal                               */\r
@@ -1629,7 +1629,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              CallID;         /* Call Identity                        */\r
        L3UCHAR                 buf[1];\r
 }Q931mes_Resume;\r
@@ -1645,7 +1645,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              ChanID;         /* Channel ID                           */\r
     ie              Display;        /* Display                              */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
@@ -1662,7 +1662,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Cause;          /* Cause                                */\r
     ie              Display;        /* Display                              */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
@@ -1679,7 +1679,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
 }Q931mes_Segment;\r
 \r
@@ -1694,7 +1694,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              SendComplete;   /* Sending Complete                     */\r
     ie              RepeatInd;      /* Repeat Indicator                     */\r
     ie              BearerCap;      /* Bearer Capability                    */\r
@@ -1743,7 +1743,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              ChanID;         /* Channel ID                           */\r
     ie              ProgInd;        /* Progress Indicator                   */\r
     ie              Display;        /* Display                              */\r
@@ -1762,7 +1762,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Cause;          /* Cause                                */\r
     ie              CallState;      /* Call State                           */\r
     ie              Display;        /* Display                              */\r
@@ -1780,7 +1780,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Display;        /* Display                              */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
 }Q931mes_StatusEnquiry;\r
@@ -1796,7 +1796,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              CallID;         /* Call Identity                        */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
 }Q931mes_Suspend;\r
@@ -1812,7 +1812,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Display;        /* Display                              */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
 }Q931mes_SuspendAck;\r
@@ -1828,7 +1828,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              Cause;          /* Cause                                */\r
     ie              Display;        /* Display                              */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
@@ -1845,7 +1845,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              CongLevel;      /* Congestion level                     */\r
     ie              Cause;          /* Cause                                */\r
     ie              Display;        /* Display                              */\r
@@ -1863,7 +1863,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              MoreData;       /* More data                            */\r
     ie              UserUser;       /* User-user                            */\r
     L3UCHAR         buf[1];         /* Dynamic buffer                       */\r
@@ -1880,7 +1880,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              ChanID;         /* Channel identification               */\r
     ie              Display;        /* Display                              */\r
     ie              RestartInd;     /* Restart indicator                    */\r
@@ -1898,7 +1898,7 @@ typedef struct
     L3UINT          Size;           /* Size of message in bytes             */\r
     L3UCHAR         ProtDisc;       /* Protocol Discriminator               */\r
     L3UCHAR         MesType;        /* Message type                         */\r
-    L3USHORT        CRV;            /* Call reference value                 */\r
+    L3INT           CRV;            /* Call reference value                 */\r
     ie              ChanID;         /* Channel identification               */\r
     ie              Display;        /* Display                              */\r
     ie              RestartWin;     /* Restart Window                       */\r
@@ -1946,7 +1946,7 @@ typedef struct
        {\r
                Q931_TrState_NoAlignment=0,     /* Trunk not aligned                                    */\r
                Q931_TrState_Aligning=1,        /* Aligning in progress                                 */\r
-               Q931_TrState_Aligned=2,         /* Trunk Aligned                                                */\r
+               Q931_TrState_Aligned=2          /* Trunk Aligned                                                */\r
        }TrunkState;\r
 \r
     L3INT       LastCRV;            /* Last used crv for the trunk.         */\r
@@ -2377,8 +2377,8 @@ L3INT     Q931CreateCRV(Q931_TrunkInfo *pTrunk, L3INT * callIndex);
 L3INT  Q931AllocateCRV(Q931_TrunkInfo *pTrunk, L3INT iCRV, L3INT * callIndex);\r
 L3INT   Q931FindCRV(Q931_TrunkInfo *pTrunk, L3INT crv, L3INT *callindex);\r
 L3INT  Q931GetCallState(Q931_TrunkInfo *pTrunk, L3INT iCRV);\r
-L3INT  Q931StartTimer(Q931_TrunkInfo *pTrunk, L3INT callIndex, L3INT iTimer);\r
-L3INT  Q931StopTimer(Q931_TrunkInfo *pTrunk, L3INT callindex, L3INT iTimer);\r
+L3INT  Q931StartTimer(Q931_TrunkInfo *pTrunk, L3INT callIndex, L3USHORT iTimer);\r
+L3INT  Q931StopTimer(Q931_TrunkInfo *pTrunk, L3INT callindex, L3USHORT iTimer);\r
 L3INT  Q931SetState(Q931_TrunkInfo *pTrunk, L3INT callIndex, L3INT iState);\r
 L3ULONG Q931GetTime();\r
 void   Q931AddStateEntry(L3UCHAR iD, L3INT iState, L3INT iMes, L3UCHAR cDir);\r