[PHP-CVS] cvs: php4 /ext/yaz php_yaz.c

[Adam Dickmeiss]

dickmeiss               Fri May 30 05:48:49 2003 EDT

  Modified files:              
    /php4/ext/yaz       php_yaz.c 
  Log:
  Prevent yaz from logging unless yaz.log_file is set
  
Index: php4/ext/yaz/php_yaz.c
diff -u php4/ext/yaz/php_yaz.c:1.73 php4/ext/yaz/php_yaz.c:1.74
--- php4/ext/yaz/php_yaz.c:1.73 Tue May 27 05:47:26 2003
+++ php4/ext/yaz/php_yaz.c      Fri May 30 05:48:49 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_yaz.c,v 1.73 2003/05/27 09:47:26 dickmeiss Exp $ */
+/* $Id: php_yaz.c,v 1.74 2003/05/30 09:48:49 dickmeiss Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1492,6 +1492,7 @@
 PHP_MINIT_FUNCTION(yaz)
 {
        int i;
+       const char *fname;
        nmem_init();
 #ifdef ZTS
        yaz_mutex = tsrm_mutex_alloc();
@@ -1501,12 +1502,14 @@
 
        REGISTER_INI_ENTRIES();
 
-       if (YAZSG(log_file)) {
+       fname = YAZSG(log_file);
+       if (fname && *fname)
+       {
+               yaz_log_init_file(fname);
                yaz_log_init_level(LOG_ALL);
-               yaz_log_init_file(YAZSG(log_file));
-       } else {
-               yaz_log_init_level(0);
        }
+       else
+               yaz_log_init_level(0);
 
        le_link = zend_register_list_destructors_ex (yaz_close_link, 0, "YAZ link", 
module_number);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php