normalize using unsigned char for buffers instead of mixed signed/unsigned in isdn...

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@68 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/src/isdn/Q921.c b/libs/openzap/src/isdn/Q921.c
index 81e709ba193e3369bea83d358e0094fbcc093184..1396471570d37694f08026a4e5acdeaaf059abab 100644 (file)
--- a/libs/openzap/src/isdn/Q921.c
+++ b/libs/openzap/src/isdn/Q921.c
@@ -43,7 +43,7 @@
   POSSIBILITY OF SUCH DAMAGE.\r
 \r
 *****************************************************************************/\r
-#include "Q921.h"\r
+#include "q921.h"\r
 #include <stdlib.h>\r
 #include "mfifo.h"\r
 \r
@@ -111,7 +111,7 @@ void Q921SetTx23CB(int (*callback)(int dev, unsigned char *, int))
                 size    size of frame in bytes\r
 \r
 *****************************************************************************/\r
-int Q921QueueHDLCFrame(int trunk, char *b, int size)\r
+int Q921QueueHDLCFrame(int trunk, unsigned char *b, int size)\r
 {\r
     return MFIFOWriteMes(Q921DevSpace[trunk].HDLCInQueue, b, size);\r
 }\r
@@ -135,7 +135,7 @@ int Q921QueueHDLCFrame(int trunk, char *b, int size)
   Return Value: 0 if failed, 1 if Send.\r
 \r
 *****************************************************************************/\r
-int Q921SendI(int trunk, unsigned char Sapi, char cr, unsigned char Tei, char pf, char *mes, int size)\r
+int Q921SendI(int trunk, unsigned char Sapi, char cr, unsigned char Tei, char pf, unsigned char *mes, int size)\r
 {\r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -164,7 +164,7 @@ int Q921SendI(int trunk, unsigned char Sapi, char cr, unsigned char Tei, char pf
 \r
 int Q921SendRR(int trunk, int Sapi, int cr, int Tei, int pf)\r
 {\r
-    char mes[400];\r
+    unsigned char mes[400];\r
 \r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -191,7 +191,7 @@ int Q921SendRR(int trunk, int Sapi, int cr, int Tei, int pf)
 *****************************************************************************/\r
 int Q921SendRNR(int trunk, int Sapi, int cr, int Tei, int pf)\r
 {\r
-    char mes[400];\r
+    unsigned char mes[400];\r
 \r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -218,7 +218,7 @@ int Q921SendRNR(int trunk, int Sapi, int cr, int Tei, int pf)
 *****************************************************************************/\r
 int Q921SendREJ(int trunk, int Sapi, int cr, int Tei, int pf)\r
 {\r
-    char mes[400];\r
+    unsigned char mes[400];\r
 \r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -245,7 +245,7 @@ int Q921SendREJ(int trunk, int Sapi, int cr, int Tei, int pf)
 *****************************************************************************/\r
 int Q921SendSABME(int trunk, int Sapi, int cr, int Tei, int pf)\r
 {\r
-    char mes[400];\r
+    unsigned char mes[400];\r
 \r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -271,7 +271,7 @@ int Q921SendSABME(int trunk, int Sapi, int cr, int Tei, int pf)
 *****************************************************************************/\r
 int Q921SendDM(int trunk, int Sapi, int cr, int Tei, int pf)\r
 {\r
-    char mes[400];\r
+    unsigned char mes[400];\r
 \r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -316,7 +316,7 @@ int Q921SendDM(int trunk, int Sapi, int cr, int Tei, int pf)
 *****************************************************************************/\r
 int Q921SendDISC(int trunk, int Sapi, int cr, int Tei, int pf)\r
 {\r
-    char mes[400];\r
+    unsigned char mes[400];\r
 \r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -342,7 +342,7 @@ int Q921SendDISC(int trunk, int Sapi, int cr, int Tei, int pf)
 *****************************************************************************/\r
 int Q921SendUA(int trunk, int Sapi, int cr, int Tei, int pf)\r
 {\r
-    char mes[400];\r
+    unsigned char mes[400];\r
 \r
     mes[Q921HeaderSpace+0] = (Sapi&0xfc) | ((cr<<1)&0x02);\r
     mes[Q921HeaderSpace+1] = (Tei<<1) | 0x01;\r
@@ -389,7 +389,7 @@ int Q921SendUA(int trunk, int Sapi, int cr, int Tei, int pf)
 //{\r
 //}\r
 \r
-int Q921ProcSABME(int trunk, char *mes, int size)\r
+int Q921ProcSABME(int trunk, unsigned char *mes, int size)\r
 {\r
     Q921DevSpace[trunk].vr=0;\r
     Q921DevSpace[trunk].vs=0;\r
@@ -417,9 +417,9 @@ int Q921ProcSABME(int trunk, char *mes, int size)
 *****************************************************************************/\r
 int Q921Rx12(long trunk)\r
 {\r
-    char *mes;\r
+    unsigned char *mes;\r
     int rs,size;     /* receive size & Q921 frame size*/\r
-    char *smes = MFIFOGetMesPtr(Q921DevSpace[trunk].HDLCInQueue, &size);\r
+    unsigned char *smes = MFIFOGetMesPtr(Q921DevSpace[trunk].HDLCInQueue, &size);\r
     if(smes != NULL)\r
     {\r
         rs = size - Q921HeaderSpace;\r

diff --git a/libs/openzap/src/isdn/Q932mes.c b/libs/openzap/src/isdn/Q932mes.c
index 0540fa80f030504c02f4b207ee703908848d7c66..c0cf6505c3f7a8876381f129f501bc0e6455b822 100644 (file)
--- a/libs/openzap/src/isdn/Q932mes.c
+++ b/libs/openzap/src/isdn/Q932mes.c
@@ -48,7 +48,6 @@ L3INT Q932Umes_Facility(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3I
     L3INT i = IOff;\r
        L3INT ir=0;\r
        L3INT OOff=0;\r
-       L3INT rc=Q931E_NO_ERROR;\r
        Q932mes_Facility *mes = (Q932mes_Facility*)IBuf;\r
 \r
        //TODO\r

diff --git a/libs/openzap/src/isdn/include/Q921.h b/libs/openzap/src/isdn/include/Q921.h
index acb830383f74d0515288683c3b067b74eebf9c86..5537a17aebf3071d1b83da20c7cf63fff4f7fd2e 100644 (file)
--- a/libs/openzap/src/isdn/include/Q921.h
+++ b/libs/openzap/src/isdn/include/Q921.h
@@ -85,7 +85,7 @@
 \r
 typedef struct\r
 {\r
-    char HDLCInQueue[Q921MAXHDLCSPACE];\r
+    unsigned char HDLCInQueue[Q921MAXHDLCSPACE];\r
     unsigned char vs;\r
     unsigned char vr;\r
     int state;\r
@@ -95,7 +95,7 @@ void Q921Init();
 void Q921SetHeaderSpace(int hspace);\r
 void Q921SetTx21CB(int (*callback)(int dev, unsigned char *, int));\r
 void Q921SetTx23CB(int (*callback)(int dev, unsigned char *, int));\r
-int Q921QueueHDLCFrame(int trunk, char *b, int size);\r
+int Q921QueueHDLCFrame(int trunk, unsigned char *b, int size);\r
 int Q921Rx12(long trunk);\r
 \r
 #endif\r

diff --git a/libs/openzap/src/isdn/include/Q931.h b/libs/openzap/src/isdn/include/Q931.h
index dd8261cff39e4e98f378301456921e451d5fc1a9..6e71a27420d55034f2f7b06572c3d08f53df7459 100644 (file)
--- a/libs/openzap/src/isdn/include/Q931.h
+++ b/libs/openzap/src/isdn/include/Q931.h
@@ -112,6 +112,12 @@
 \r
 #include "stdio.h"\r
 \r
+#ifdef _MSC_VER\r
+/* warning C4100 : unreferenced formal parameter */\r
+/* warning C4189 : local variable is initialized but not referenced  TODO:  This one should not be disabled*/\r
+#pragma warning(disable:4100 4189)\r
+#endif\r
+\r
 /*****************************************************************************\r
 \r
   Error Codes\r

diff --git a/libs/openzap/src/isdn/include/mfifo.h b/libs/openzap/src/isdn/include/mfifo.h
index 21a053173eb4ba35284b3574c5b729cec839e9e7..788adfdb10ef864e416baea69d67a05fa120a635 100644 (file)
--- a/libs/openzap/src/isdn/include/mfifo.h
+++ b/libs/openzap/src/isdn/include/mfifo.h
@@ -63,7 +63,7 @@ typedef struct _mfifo
        int first;                      /* first out                            */\r
        int last;                       /* last in + 1                          */\r
        int bsize;                      /* buffer size                          */\r
-       char *buf;                      /* ptr to start of buffer               */\r
+       unsigned char *buf;                      /* ptr to start of buffer               */\r
     int ixsize;                     /* index size                           */\r
     MINDEX ix[1];                   /* message index                        */\r
 }MFIFO;\r
@@ -71,13 +71,13 @@ typedef struct _mfifo
 /*****************************************************************************\r
   Function prototypes.\r
 *****************************************************************************/\r
-int MFIFOCreate(char *buf, int size, int index);\r
-void MFIFOClear(char * buf);\r
-int MFIFOGetLBOffset(char *buf);\r
-int MFIFOGetFBOffset(char *buf);\r
-void MFIFOWriteIX(char *buf, char *mes, int size, int ix, int off);\r
-int MFIFOWriteMes(char *buf, char *mes, int size);\r
-char * MFIFOGetMesPtr(char *buf, int *size);\r
-void MFIFOKillNext(char *buf);\r
+int MFIFOCreate(unsigned char *buf, int size, int index);\r
+void MFIFOClear(unsigned char * buf);\r
+int MFIFOGetLBOffset(unsigned char *buf);\r
+int MFIFOGetFBOffset(unsigned char *buf);\r
+void MFIFOWriteIX(unsigned char *buf, unsigned char *mes, int size, int ix, int off);\r
+int MFIFOWriteMes(unsigned char *buf, unsigned char *mes, int size);\r
+unsigned char * MFIFOGetMesPtr(unsigned char *buf, int *size);\r
+void MFIFOKillNext(unsigned char *buf);\r
 \r
 #endif\r

diff --git a/libs/openzap/src/isdn/mfifo.c b/libs/openzap/src/isdn/mfifo.c
index adf6bc9ebd3644f6e3d9541f4160e10c717211b5..9e409f8a92095bb1894ecd9855280bcd816c8421 100644 (file)
--- a/libs/openzap/src/isdn/mfifo.c
+++ b/libs/openzap/src/isdn/mfifo.c
@@ -82,7 +82,7 @@
   Return value: 0 if failure, 1 if ok.\r
 \r
 *****************************************************************************/\r
-int MFIFOCreate(char *buf, int size, int index)\r
+int MFIFOCreate(unsigned char *buf, int size, int index)\r
 {\r
     MFIFO * mf;\r
     mf = (MFIFO*)buf;\r
@@ -110,7 +110,7 @@ int MFIFOCreate(char *buf, int size, int index)
   Return Value: none\r
 \r
 *****************************************************************************/\r
-void MFIFOClear(char * buf)\r
+void MFIFOClear(unsigned char * buf)\r
 {\r
     MFIFO * mf;\r
     mf = (MFIFO*)buf;\r
@@ -128,7 +128,7 @@ void MFIFOClear(char * buf)
   Return Value: offset.\r
 \r
 *****************************************************************************/\r
-int MFIFOGetLBOffset(char *buf)\r
+int MFIFOGetLBOffset(unsigned char *buf)\r
 {\r
     MFIFO * mf;\r
     mf = (MFIFO*)buf;\r
@@ -151,7 +151,7 @@ int MFIFOGetLBOffset(char *buf)
   Return Value: offset\r
 \r
 *****************************************************************************/\r
-int MFIFOGetFBOffset(char *buf)\r
+int MFIFOGetFBOffset(unsigned char *buf)\r
 {\r
     int x;\r
     MFIFO * mf;\r
@@ -182,7 +182,7 @@ int MFIFOGetFBOffset(char *buf)
   Return Value: none\r
 \r
 *****************************************************************************/\r
-void MFIFOWriteIX(char *buf, char *mes, int size, int ix, int off)\r
+void MFIFOWriteIX(unsigned char *buf, unsigned char *mes, int size, int ix, int off)\r
 {\r
     int x;\r
     MFIFO * mf;\r
@@ -207,7 +207,7 @@ void MFIFOWriteIX(char *buf, char *mes, int size, int ix, int off)
   Return Value:\r
 \r
 *****************************************************************************/\r
-int MFIFOWriteMes(char *buf, char *mes, int size)\r
+int MFIFOWriteMes(unsigned char *buf, unsigned char *mes, int size)\r
 {\r
     int of,ol,x;\r
     MFIFO * mf;\r
@@ -260,7 +260,7 @@ int MFIFOWriteMes(char *buf, char *mes, int size)
   Return Value:\r
 \r
 *****************************************************************************/\r
-char * MFIFOGetMesPtr(char *buf, int *size)\r
+unsigned char * MFIFOGetMesPtr(unsigned char *buf, int *size)\r
 {\r
     MFIFO * mf;\r
     mf = (MFIFO*)buf;\r
@@ -281,7 +281,7 @@ char * MFIFOGetMesPtr(char *buf, int *size)
   Return Value:\r
 \r
 *****************************************************************************/\r
-void MFIFOKillNext(char *buf)\r
+void MFIFOKillNext(unsigned char *buf)\r
 {\r
     int x;\r
     MFIFO * mf;\r