windows build, add missing files.

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

diff --git a/libs/freetdm/openzap.vcproj b/libs/freetdm/openzap.vcproj
index f6ca7e8c6d4855ec031e51dd27e99a7879721491..7c3f70d4ee8cd55890f945b096ae01f6b1e00c4e 100644 (file)
--- a/libs/freetdm/openzap.vcproj
+++ b/libs/freetdm/openzap.vcproj
@@ -164,10 +164,22 @@
                                RelativePath=".\src\hashtable_itr.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\libteletone_detect.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\libteletone_generate.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\openzap.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\zap_buffer.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\zap_config.c"\r
                                >\r
@@ -208,6 +220,10 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\src\include\g711.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\include\hashtable.h"\r
                                >\r
@@ -220,10 +236,26 @@
                                RelativePath=".\src\include\hashtable_private.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\include\libteletone.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\include\libteletone_detect.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\include\libteletone_generate.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\include\openzap.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\include\zap_buffer.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\include\zap_config.h"\r
                                >\r

diff --git a/libs/freetdm/src/openzap.c b/libs/freetdm/src/openzap.c
index acf21e14f2fbe0373944f50378c1efcd52031871..6626ccef77c39ae9b0f58d9dd616f1a66709d704 100644 (file)
--- a/libs/freetdm/src/openzap.c
+++ b/libs/freetdm/src/openzap.c
@@ -74,9 +74,10 @@ static char *cut_path(char *in)
 
 static void null_logger(char *file, const char *func, int line, int level, char *fmt, ...)
 {
-       if (0) {
-               null_logger(file, func, line, level, fmt);
+       if (file && func && line && level && fmt) {
+               return;
        }
+       return;
 }
 
 static void default_logger(char *file, const char *func, int line, int level, char *fmt, ...)

diff --git a/libs/freetdm/src/zap_buffer.c b/libs/freetdm/src/zap_buffer.c
index b3df9ba0ab35b1c3c8afa7ba1515843d37a8dde7..63ae360414b508fdffd26afa3e098ab5e51f29b3 100644 (file)
--- a/libs/freetdm/src/zap_buffer.c
+++ b/libs/freetdm/src/zap_buffer.c
@@ -53,11 +53,13 @@ zap_status_t zap_buffer_create(zap_buffer_t **buffer, zap_size_t blocksize, zap_
 {
        zap_buffer_t *new_buffer;
 
-       if ((new_buffer = malloc(sizeof(*new_buffer)))) {
+       new_buffer = malloc(sizeof(*new_buffer));
+       if (new_buffer) {
                memset(new_buffer, 0, sizeof(*new_buffer));
 
                if (start_len) {
-                       if (!(new_buffer->data = malloc(start_len))) {
+                       new_buffer->data = malloc(start_len);
+                       if (!new_buffer->data) {
                                free(new_buffer);
                                return ZAP_MEMERR;
                        }
@@ -211,7 +213,8 @@ zap_size_t zap_buffer_write(zap_buffer_t *buffer, const void *data, zap_size_t d
                        new_size = new_block_size;
                }
                buffer->head = buffer->data;
-               if (!(buffer->data = realloc(buffer->data, new_size))) {
+               buffer->data = realloc(buffer->data, new_size);
+               if (!buffer->data) {
                        return 0;
                }
                buffer->head = buffer->data;