[PHP-CVS] cvs: php4 /ext/iconv iconv.c /ext/pdf pdf.c

[Rui Hirokawa]

hirokawa                Fri Mar  9 18:03:26 2001 EDT

  Modified files:              
    /php4/ext/iconv     iconv.c 
    /php4/ext/pdf       pdf.c 
  Log:
  initialized some strings in global variable structure.
  
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.7 php4/ext/iconv/iconv.c:1.8
--- php4/ext/iconv/iconv.c:1.7  Mon Feb 26 07:41:38 2001
+++ php4/ext/iconv/iconv.c      Fri Mar  9 18:03:25 2001
@@ -18,10 +18,11 @@
  */
 
 #include "php.h"
+#include "php_ini.h"
+#include "php_config.h"
 
 #if HAVE_ICONV
 
-#include "php_ini.h"
 #include "php_iconv.h"
 #include "ext/standard/info.h"
 
@@ -76,10 +77,17 @@
         STD_PHP_INI_ENTRY("iconv.internal_encoding",           
ICONV_INTERNAL_ENCODING,                PHP_INI_ALL,            OnUpdateString,  
internal_encoding,             zend_iconv_globals,  iconv_globals)
 PHP_INI_END()
 
+static void
+php_iconv_init_globals(zend_iconv_globals *iconv_globals)
+{
+       iconv_globals->input_encoding = NULL;
+       iconv_globals->output_encoding = NULL;
+       iconv_globals->internal_encoding = NULL;
+}
 
 PHP_MINIT_FUNCTION(iconv)
 {
-       ZEND_INIT_MODULE_GLOBALS(iconv, NULL, NULL);
+       ZEND_INIT_MODULE_GLOBALS(iconv, php_iconv_init_globals, NULL);
        REGISTER_INI_ENTRIES();
        return SUCCESS;
 }
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.75 php4/ext/pdf/pdf.c:1.76
--- php4/ext/pdf/pdf.c:1.75     Mon Mar  5 08:18:50 2001
+++ php4/ext/pdf/pdf.c  Fri Mar  9 18:03:26 2001
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: pdf.c,v 1.75 2001/03/05 16:18:50 rjs Exp $ */
+/* $Id: pdf.c,v 1.76 2001/03/10 02:03:26 hirokawa Exp $ */
 /* Id: pdf.c,v 1.73 2001/02/26 06:07:11 andi Exp  */
 
 /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
@@ -27,6 +27,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
+#include "php_config.h"
 #include "ext/standard/head.h"
 #include "ext/standard/info.h"
 #include "ext/standard/file.h"
@@ -293,7 +294,7 @@
 #else
        php_info_print_table_row(2, "PDFlib GmbH Version", tmp );
 #endif
-       php_info_print_table_row(2, "Revision", "$Revision: 1.75 $" );
+       php_info_print_table_row(2, "Revision", "$Revision: 1.76 $" );
        php_info_print_table_end();
 
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]