iliaa Thu Oct 16 22:21:28 2003 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/snmp snmp.c
Log:
Fixed formatting issues (patch by: Joe Orton)
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.241 php-src/sapi/cgi/cgi_main.c:1.242
--- php-src/sapi/cgi/cgi_main.c:1.241 Wed Sep 3 04:15:09 2003
+++ php-src/sapi/cgi/cgi_main.c Thu Oct 16 22:21:26 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.241 2003/09/03 08:15:09 sas Exp $ */
+/* $Id: cgi_main.c,v 1.242 2003/10/17 02:21:26 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -923,7 +923,7 @@
char *script_file=NULL;
zend_llist global_vars;
#if FORCE_CGI_REDIRECT
- int force_redirect = 1;
+ long force_redirect = 1;
char *redirect_status_env = NULL;
#endif
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.175 php-src/ext/odbc/php_odbc.c:1.176
--- php-src/ext/odbc/php_odbc.c:1.175 Sun Aug 31 08:41:41 2003
+++ php-src/ext/odbc/php_odbc.c Thu Oct 16 22:21:26 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.175 2003/08/31 12:41:41 zeev Exp $ */
+/* $Id: php_odbc.c,v 1.176 2003/10/17 02:21:26 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2225,12 +2225,12 @@
list_entry new_le;
if (ODBCG(max_links) != -1 && ODBCG(num_links) >=
ODBCG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open links (%d)", ODBCG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open links (%ld)", ODBCG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
if (ODBCG(max_persistent) != -1 && ODBCG(num_persistent) >=
ODBCG(max_persistent)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,"Too many
open persistent links (%d)", ODBCG(num_persistent));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Too many
open persistent links (%ld)", ODBCG(num_persistent));
efree(hashed_details);
RETURN_FALSE;
}
@@ -2309,7 +2309,7 @@
}
}
if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,"Too many open
connections (%d)",ODBCG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Too many open
connections (%ld)",ODBCG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.87 php-src/ext/snmp/snmp.c:1.88
--- php-src/ext/snmp/snmp.c:1.87 Tue Sep 23 14:26:02 2003
+++ php-src/ext/snmp/snmp.c Thu Oct 16 22:21:27 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.87 2003/09/23 18:26:02 iliaa Exp $ */
+/* $Id: snmp.c,v 1.88 2003/10/17 02:21:27 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -277,13 +277,13 @@
/* ASN_UNSIGNED is the same as ASN_GAUGE */
case ASN_TIMETICKS: /* 0x43, snmp_impl.h */
case ASN_UINTEGER: /* 0x47, snmp_impl.h */
- snprintf(buf, sizeof(buf)-1, "%u", *vars->val.integer);
+ snprintf(buf, sizeof(buf)-1, "%lu", *vars->val.integer);
buf[sizeof(buf)-1]=0;
ZVAL_STRING(val, buf, 1);
break;
case ASN_INTEGER: /* 0x02, asn1.h */
- snprintf(buf, sizeof(buf)-1, "%d", *vars->val.integer);
+ snprintf(buf, sizeof(buf)-1, "%ld", *vars->val.integer);
buf[sizeof(buf)-1]=0;
ZVAL_STRING(val, buf, 1);
break;
@@ -920,7 +920,7 @@
/* Setting the security level. */
convert_to_string_ex(a3);
if (netsnmp_session_set_sec_level(&session, Z_STRVAL_PP(a3) TSRMLS_CC)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level:
%s", a3);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level:
%s", Z_STRVAL_PP(a3));
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
