From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 17 Oct 2003 02:21:37 +0000 (+0000)
Subject: MFH: Fixed formatting issues (patch by: Joe Orton)
X-Git-Tag: php-4.3.4RC2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=800b1765ae8acc0f93eac38698a1fb17a3749947;p=php

MFH: Fixed formatting issues (patch by: Joe Orton)
---

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 49d40e55e2..6466330cd7 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2224,12 +2224,12 @@ try_and_get_another_connection:
 			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;
 			}
@@ -2308,7 +2308,7 @@ try_and_get_another_connection:
 			}
 		}
 		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;
 		}
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 80f808a500..0bfc8d3a52 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -279,13 +279,13 @@ static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_D
 	/* 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;
@@ -906,7 +906,7 @@ static void php_snmpv3(INTERNAL_FUNCTION_PARAMETERS, int st)
 	/* 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;
 	}
 
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 0dfed44039..953820a4f3 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -956,7 +956,7 @@ int main(int argc, char *argv[])
 	zend_llist global_vars;
 	int interactive=0;
 #if FORCE_CGI_REDIRECT
-	int force_redirect = 1;
+	long force_redirect = 1;
 	char *redirect_status_env = NULL;
 #endif