Minor file.c cleanup for valgrind, log PRI event properly

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2189 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 3550573299d7ee1c214172e335c807bf4248f08d..eb4cc05008a455cfa675136b7be682ae26a3e273 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6661,7 +6661,7 @@ static void *pri_dchannel(void *vpri)
                        x = 0;
                        res = ioctl(pri->fd, ZT_GETEVENT, &x);
                        if (x) 
-                               printf("PRI got event: %d\n", x);
+                               ast_log(LOG_NOTICE, "PRI got event: %d on span %d\n", x, pri->span);
                        if (option_debug)
                                ast_log(LOG_DEBUG, "Got event %s (%d) on D-channel for span %d\n", event2str(x), x, pri->span);
                }

diff --git a/file.c b/file.c
index 9869eb325f8e6f7c389a4fb027556b8292314d1c..f9a421ed4c2d1acb0df5781e01b94bd0653bed1a 100755 (executable)
--- a/file.c
+++ b/file.c
@@ -274,7 +274,7 @@ static int copy(char *infile, char *outfile)
 static char *build_filename(char *filename, char *ext)
 {
        char *fn;
-       char tmp[AST_CONFIG_MAX_PATH];
+       char tmp[AST_CONFIG_MAX_PATH]="";
        snprintf(tmp,sizeof(tmp)-1,"%s/%s",(char *)ast_config_AST_VAR_DIR,"sounds");
        fn = malloc(strlen(tmp) + strlen(filename) + strlen(ext) + 10);
        if (fn) {