cvs: php4 /ext/gd/ gd.c /ext/ldap/ ldap.c

rasmus Wed May 24 10:58:40 2000 EDT Modified files: /php4/ext/gd gd.c /php4/ext/ldap ldap.c Log: @ Fix a couple of warnings in the gd and ldap modules num_links is a long there Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.61 php4/ext/gd/gd.c:1.62 --- php4/ext/gd/gd.c:1.61 Wed May 24 00:28:07 2000 +++ php4/ext/gd/gd.c Wed May 24 10:58:40 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.61 2000/05/23 22:28:07 hholzgra Exp $ */ +/* $Id: gd.c,v 1.62 2000/05/24 08:58:40 rasmus Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1894,7 +1894,7 @@ void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode) { zval **IM, **PTSIZE, **ANGLE, **X, **Y, **C, **FONTNAME, **COL; - gdImagePtr im; + gdImagePtr im=NULL; int col, x, y, l=0, i; int brect[8]; double ptsize, angle; Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.39 php4/ext/ldap/ldap.c:1.40 --- php4/ext/ldap/ldap.c:1.39 Tue May 23 11:33:39 2000 +++ php4/ext/ldap/ldap.c Wed May 24 10:58:40 2000 @@ -21,7 +21,7 @@ */ -/* $Id: ldap.c,v 1.39 2000/05/23 09:33:39 sas Exp $ */ +/* $Id: ldap.c,v 1.40 2000/05/24 08:58:40 rasmus Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -171,15 +171,15 @@ #endif if (LDAPG(max_links) == -1) { - snprintf(maxl, 31, "%d/unlimited", LDAPG(num_links) ); + snprintf(maxl, 31, "%ld/unlimited", LDAPG(num_links) ); } else { - snprintf(maxl, 31, "%d/%ld", LDAPG(num_links), LDAPG(max_links)); + snprintf(maxl, 31, "%ld/%ld", LDAPG(num_links), LDAPG(max_links)); } maxl[31] = 0; php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.39 2000/05/23 09:33:39 sas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.40 2000/05/24 08:58:40 rasmus Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #if HAVE_NSLDAP