windows build add zap_callerid.c and tweak types.

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

diff --git a/libs/openzap/msvc/openzap.vcproj b/libs/openzap/msvc/openzap.vcproj
index 33776e109cd003ae87af070d5c6a19240bf3d200..67565dbb90a994304bad3b4df4dee898e5a5361c 100644 (file)
--- a/libs/openzap/msvc/openzap.vcproj
+++ b/libs/openzap/msvc/openzap.vcproj
@@ -403,6 +403,10 @@
                                        RelativePath="..\src\zap_buffer.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\src\zap_callerid.c"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\src\zap_config.c"\r
                                        >\r

diff --git a/libs/openzap/src/include/zap_types.h b/libs/openzap/src/include/zap_types.h
index ef0269fb6747d6bc47a2fc96f23a43c0eb776736..84f74ee5562fc10d7c53a6a649ca2bb1d7bc0212 100644 (file)
--- a/libs/openzap/src/include/zap_types.h
+++ b/libs/openzap/src/include/zap_types.h
@@ -85,11 +85,11 @@ struct zap_fsk_data_state {
        uint8_t init;
        uint8_t *buf;
        size_t bufsize;
-       int blen;
-       int bpos;
-       int dlen;
-       int ppos;
-       uint8_t checksum;
+       zap_size_t blen;
+       zap_size_t bpos;
+       zap_size_t dlen;
+       zap_size_t ppos;
+       int checksum;
 };
 typedef struct zap_fsk_data_state zap_fsk_data_state_t;
 

diff --git a/libs/openzap/src/zap_callerid.c b/libs/openzap/src/zap_callerid.c
index f94ec59076f3acfd3f9e10e61f4b7f5b174c7b4c..f3a685f55a0870bc87a4483b4bf22ec61ceed0e3 100644 (file)
--- a/libs/openzap/src/zap_callerid.c
+++ b/libs/openzap/src/zap_callerid.c
@@ -6,7 +6,7 @@
 static void fsk_byte_handler (void *x, int data)
 {
        zap_fsk_data_state_t *state = (zap_fsk_data_state_t *) x;
-       uint8_t byte = data;
+       uint8_t byte = (uint8_t)data;
 
  top:
 
@@ -39,7 +39,8 @@ static void fsk_byte_handler (void *x, int data)
 zap_status_t zap_fsk_data_parse(zap_fsk_data_state_t *state, zap_size_t *type, char **data, zap_size_t *len)
 {
 
-       int i, sum = 0;
+       zap_size_t i;
+       int sum = 0;
        
  top: