Fixed formatting issues (patch by: Joe Orton)

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 5903fcd6c536d89ba5697bf49c5bc98ce55538ef..1b36ad34815d50308133071f3672de4097ae7e60 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2225,12 +2225,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;
                        }
@@ -2309,7 +2309,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 1e96aef9841631921665e6965ebebe6c205e0264..7696760713bcc7d6b1a7d88b0feea1ac3ef8cb7b 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -277,13 +277,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;
@@ -920,7 +920,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 664c7483634cbc9af30b0f0af1c161b8913847fa..ff332fe09f0c912f66ecc58ae2fc481362e7317c 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -923,7 +923,7 @@ int main(int argc, char *argv[])
        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