[PHP4BETA] CVS update: php4
| From: | sas | Date: | Sun, 30 May 1999 12:00:06 +0000 |
| Subject: | [PHP4BETA] CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1204@lists.php.net to get a copy of this message | ||
Date: Sunday May 30, 1999 @ 8:00
Author: sas
Update of /repository/php4
In directory php:/tmp/cvs-serv21578
Modified Files:
main.c php_ini.c
Log Message:
kill some warnings
Index: php4/main.c
diff -u php4/main.c:1.67 php4/main.c:1.68
--- php4/main.c:1.67 Sat May 29 09:53:59 1999
+++ php4/main.c Sun May 30 08:00:06 1999
@@ -29,7 +29,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.67 1999/05/29 13:53:59 sas Exp $ */
+/* $Id: main.c,v 1.68 1999/05/30 12:00:06 sas Exp $ */
#include <stdio.h>
@@ -589,12 +589,12 @@
snprintf(memory_leak_buf, 512, "%s: Freeing 0x%0.8lX (%d bytes), allocated in %s on
line %d<br>\n", SG(request_info).path_translated, (unsigned long)ptr,
t->size,t->filename,t->lineno);
#endif
} else {
- uint leak_count = (uint) data;
+ unsigned long leak_count = (unsigned long) data;
#if WIN32||WINNT
- snprintf(memory_leak_buf, 512, "Last leak repeated %d time%s\n", leak_count,
(leak_count>1?"s":""));
+ snprintf(memory_leak_buf, 512, "Last leak repeated %ld time%s\n", leak_count,
(leak_count>1?"s":""));
#else
- snprintf(memory_leak_buf, 512, "%s: Last leak repeated %d time%s\n",
SG(request_info).path_translated, leak_count, (leak_count>1?"s":""));
+ snprintf(memory_leak_buf, 512, "%s: Last leak repeated %ld time%s\n",
SG(request_info).path_translated, leak_count, (leak_count>1?"s":""));
#endif
}
# if WIN32||WINNT
Index: php4/php_ini.c
diff -u php4/php_ini.c:1.20 php4/php_ini.c:1.21
--- php4/php_ini.c:1.20 Sat May 22 08:19:57 1999
+++ php4/php_ini.c Sun May 30 08:00:06 1999
@@ -344,7 +344,7 @@
}
PUTS("<table border=5 width=\"600\">\n");
php_info_print_table_header(3, "Directive", "Local Value", "Master
Value");
- zend_hash_apply_with_argument(&known_directives, (int (*)(void *, void *)) php_ini_displayer,
(void *) module_number);
+ zend_hash_apply_with_argument(&known_directives, (int (*)(void *, void *)) php_ini_displayer,
(void *) (long) module_number);
PUTS("</table>\n");
}
--
PHP 4 Beta