Fixed compiler warnings.

Ilia Alshanetsky · Ilia Alshanetsky · commit 9c82b1fa753a · 2003-08-31T20:45:51.000Z
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
@@ -177,7 +177,7 @@ PHP_FUNCTION(cal_info)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d.", cal);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);
 		RETURN_FALSE;
 	}
 
@@ -215,7 +215,7 @@ PHP_FUNCTION(cal_days_in_month)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d.", cal);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);
 		RETURN_FALSE;
 	}
 
@@ -245,7 +245,7 @@ PHP_FUNCTION(cal_to_jd)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d.", cal);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);
 		RETURN_FALSE;
 	}
 
@@ -268,7 +268,7 @@ PHP_FUNCTION(cal_from_jd)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d", cal);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld", cal);
 		RETURN_FALSE;
 	}
 	calendar = &cal_conversion_table[cal];
diff --git a/ext/dio/dio.c b/ext/dio/dio.c
@@ -157,7 +157,7 @@ PHP_FUNCTION(dio_open)
 	}
 
 	if (fd == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot open file %s with flags %d and permissions %d: %s", file_name, flags, mode, strerror(errno));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot open file %s with flags %ld and permissions %ld: %s", file_name, flags, mode, strerror(errno));
 		RETURN_FALSE;
 	}
 
@@ -237,7 +237,7 @@ PHP_FUNCTION(dio_truncate)
 	ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
 
 	if (ftruncate(f->fd, offset) == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "couldn't truncate %d to %d bytes: %s", f->fd, offset, strerror(errno));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "couldn't truncate %d to %ld bytes: %s", f->fd, offset, strerror(errno));
 		RETURN_FALSE;
 	}
 
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
@@ -394,7 +394,7 @@ PHP_FUNCTION(ldap_connect)
 #endif
 
 	if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", LDAPG(num_links));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", LDAPG(num_links));
 		RETURN_FALSE;
 	}
 
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
@@ -485,13 +485,13 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			list_entry new_le;
 
 			if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links));
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links));
 				efree(hashed_details);
 				dbfreelogin(mssql.login);
 				RETURN_FALSE;
 			}
 			if (MS_SQL_G(max_persistent) != -1 && MS_SQL_G(num_persistent) >= MS_SQL_G(max_persistent)) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%d)", MS_SQL_G(num_persistent));
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%ld)", MS_SQL_G(num_persistent));
 				efree(hashed_details);
 				dbfreelogin(mssql.login);
 				RETURN_FALSE;
@@ -606,7 +606,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			}
 		}
 		if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links));
 			efree(hashed_details);
 			RETURN_FALSE;
 		}
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -2298,7 +2298,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
 			cipher = EVP_des_ede3_cbc();
 			break;
 		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid cipher type `%d'", cipherid);
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid cipher type `%ld'", cipherid);
 			goto clean_exit;
 	}
 	if (cipher == NULL) {
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -1033,12 +1033,12 @@ PHP_FUNCTION(socket_create)
 		&& arg1 != AF_INET6
 #endif
 		&& arg1 != AF_INET) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket domain [%d] specified for argument 1, assuming AF_INET", arg1);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket domain [%ld] specified for argument 1, assuming AF_INET", arg1);
 		arg1 = AF_INET;
 	}
 
 	if (arg2 > 10) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket type [%d] specified for argument 2, assuming SOCK_STREAM", arg2);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket type [%ld] specified for argument 2, assuming SOCK_STREAM", arg2);
 		arg2 = SOCK_STREAM;
 	}
 	
@@ -1651,12 +1651,12 @@ PHP_FUNCTION(socket_create_pair)
 		&& domain != AF_INET6
 #endif
 		&& domain != AF_UNIX) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket domain [%d] specified for argument 1, assuming AF_INET", domain);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket domain [%ld] specified for argument 1, assuming AF_INET", domain);
 		domain = AF_INET;
 	}
 	
 	if (type > 10) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket type [%d] specified for argument 2, assuming SOCK_STREAM", type);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket type [%ld] specified for argument 2, assuming SOCK_STREAM", type);
 		type = SOCK_STREAM;
 	}
 	
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
@@ -193,7 +193,7 @@ PHP_FUNCTION(sem_get)
 
 	semid = semget(key, 3, perm|IPC_CREAT);
 	if (semid == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));
 		RETURN_FALSE;
 	}
 
@@ -225,7 +225,7 @@ PHP_FUNCTION(sem_get)
 	sop[2].sem_flg = SEM_UNDO;
 	while (semop(semid, sop, 3) == -1) {
 		if (errno != EINTR) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed acquiring SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed acquiring SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno));
 			break;
 		}
 	}
@@ -237,7 +237,7 @@ PHP_FUNCTION(sem_get)
 	count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL);
 #endif
 	if (count == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));
 	}
 
 	/* If we are the only user, then take this opportunity to set the max. */
@@ -248,17 +248,17 @@ PHP_FUNCTION(sem_get)
 		union semun semarg;
 		semarg.val = max_acquire;
 		if (semctl(semid, SYSVSEM_SEM, SETVAL, semarg) == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));
 		}
 #elif defined(SETVAL_WANTS_PTR)
 		/* This is correct for Solaris 2.6 which does not have union semun. */
 		if (semctl(semid, SYSVSEM_SEM, SETVAL, &max_acquire) == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));
 		}
 #else
 		/* This works for i.e. AIX */
 		if (semctl(semid, SYSVSEM_SEM, SETVAL, max_acquire) == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));
 		}
 #endif
 	}
@@ -270,7 +270,7 @@ PHP_FUNCTION(sem_get)
 	sop[0].sem_flg = SEM_UNDO;
 	while (semop(semid, sop, 1) == -1) {
 		if (errno != EINTR) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed releasing SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed releasing SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno));
 			break;
 		}
 	}
@@ -307,7 +307,7 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire)
 	ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, arg_id, -1, "SysV semphore", php_sysvsem_module.le_sem);
 
 	if (!acquire && sem_ptr->count == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %d (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %ld (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key);
 		RETURN_FALSE;
 	}
 
@@ -317,7 +317,7 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire)
 
 	while (semop(sem_ptr->semid, &sop, 1) == -1) {
 		if (errno != EINTR) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", acquire ? "acquire" : "release", sem_ptr->key, strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to %s key 0x%x: %s", acquire ? "acquire" : "release", sem_ptr->key, strerror(errno));
 			RETURN_FALSE;
 		}
 	}
@@ -372,7 +372,7 @@ PHP_FUNCTION(sem_remove)
 #else
 	if (semctl(sem_ptr->semid, 0, IPC_STAT, NULL) < 0) {
 #endif
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %d does not (any longer) exist", Z_LVAL_PP(arg_id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %ld does not (any longer) exist", Z_LVAL_PP(arg_id));
 		RETURN_FALSE;
 	}
 
@@ -381,7 +381,7 @@ PHP_FUNCTION(sem_remove)
 #else
 	if (semctl(sem_ptr->semid, 0, IPC_RMID, NULL) < 0) {
 #endif
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %d: %s", Z_LVAL_PP(arg_id), strerror(errno));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %ld: %s", Z_LVAL_PP(arg_id), strerror(errno));
 		RETURN_FALSE;
 	}
 	
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
@@ -215,7 +215,7 @@ PHP_FUNCTION(shm_remove)
 	}
 
 	if (shmctl(shm_list_ptr->id, IPC_RMID,NULL) < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x, id %i: %s", shm_list_ptr->key, id, strerror(errno));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x, id %ld: %s", shm_list_ptr->key, id, strerror(errno));
 		RETURN_FALSE;
 	} 
 
@@ -246,7 +246,7 @@ PHP_FUNCTION(shm_put_var)
 
 	shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
 	if (type != php_sysvshm.le_shm) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a SysV shared memory index", id);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);
 		RETURN_FALSE;
 	}
 
@@ -293,7 +293,7 @@ PHP_FUNCTION(shm_get_var)
 
 	shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
 	if (type != php_sysvshm.le_shm) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a SysV shared memory index", id);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);
 		RETURN_FALSE;
 	}
 
@@ -302,7 +302,7 @@ PHP_FUNCTION(shm_get_var)
 	shm_varpos = php_check_shm_data((shm_list_ptr->ptr), key);
 
 	if (shm_varpos < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %d doesn't exist", key);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %ld doesn't exist", key);
 		RETURN_FALSE;
 	}
 	shm_var = (sysvshm_chunk*) ((char *)shm_list_ptr->ptr + shm_varpos);
@@ -339,14 +339,14 @@ PHP_FUNCTION(shm_remove_var)
 
 	shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
 	if (type != php_sysvshm.le_shm) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a SysV shared memory index", id);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);
 		RETURN_FALSE;
 	}
 
 	shm_varpos = php_check_shm_data((shm_list_ptr->ptr), key);
 
 	if (shm_varpos < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %d doesn't exist", key);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %ld doesn't exist", key);
 		RETURN_FALSE;
 	}
 	php_remove_shm_data((shm_list_ptr->ptr), shm_varpos);	
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -921,7 +921,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
             else {
                /* could not create description */
                if(err.xml_elem_error.parser_code) {
-                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %i, column %i, message: %s] Unable to add introspection data returned from %s()", 
+                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", 
                              err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, Z_STRVAL_PP(php_function));
                }
                else {
@@ -1189,7 +1189,7 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions)
 		} else {
 			/* could not create description */
 			if(err.xml_elem_error.parser_code) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %i, column %i, message: %s] Unable to create introspection data", 
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to create introspection data", 
 				err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error);
 			} else {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid xml structure. Unable to create introspection data");

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ PHP_FUNCTION(cal_info)`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if (cal < 0 \|\| cal >= CAL_NUM_CALS) {`
`180`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d.", cal);`
	`180`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);`
`181`	`181`	`RETURN_FALSE;`
`182`	`182`	`}`
`183`	`183`
`@@ -215,7 +215,7 @@ PHP_FUNCTION(cal_days_in_month)`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`if (cal < 0 \|\| cal >= CAL_NUM_CALS) {`
`218`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d.", cal);`
	`218`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);`
`219`	`219`	`RETURN_FALSE;`
`220`	`220`	`}`
`221`	`221`
`@@ -245,7 +245,7 @@ PHP_FUNCTION(cal_to_jd)`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`if (cal < 0 \|\| cal >= CAL_NUM_CALS) {`
`248`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d.", cal);`
	`248`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);`
`249`	`249`	`RETURN_FALSE;`
`250`	`250`	`}`
`251`	`251`
`@@ -268,7 +268,7 @@ PHP_FUNCTION(cal_from_jd)`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`if (cal < 0 \|\| cal >= CAL_NUM_CALS) {`
`271`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %d", cal);`
	`271`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld", cal);`
`272`	`272`	`RETURN_FALSE;`
`273`	`273`	`}`
`274`	`274`	`calendar = &cal_conversion_table[cal];`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ PHP_FUNCTION(dio_open)`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`if (fd == -1) {`
`160`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot open file %s with flags %d and permissions %d: %s", file_name, flags, mode, strerror(errno));`
	`160`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot open file %s with flags %ld and permissions %ld: %s", file_name, flags, mode, strerror(errno));`
`161`	`161`	`RETURN_FALSE;`
`162`	`162`	`}`
`163`	`163`
`@@ -237,7 +237,7 @@ PHP_FUNCTION(dio_truncate)`
`237`	`237`	`ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);`
`238`	`238`
`239`	`239`	`if (ftruncate(f->fd, offset) == -1) {`
`240`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "couldn't truncate %d to %d bytes: %s", f->fd, offset, strerror(errno));`
	`240`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "couldn't truncate %d to %ld bytes: %s", f->fd, offset, strerror(errno));`
`241`	`241`	`RETURN_FALSE;`
`242`	`242`	`}`
`243`	`243`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ PHP_FUNCTION(ldap_connect)`
`394`	`394`	`#endif`
`395`	`395`
`396`	`396`	`if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) {`
`397`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", LDAPG(num_links));`
	`397`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", LDAPG(num_links));`
`398`	`398`	`RETURN_FALSE;`
`399`	`399`	`}`
`400`	`400`
Original file line number	Diff line number	Diff line change
`@@ -485,13 +485,13 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)`
`485`	`485`	`list_entry new_le;`
`486`	`486`
`487`	`487`	`if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) {`
`488`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links));`
	`488`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links));`
`489`	`489`	`efree(hashed_details);`
`490`	`490`	`dbfreelogin(mssql.login);`
`491`	`491`	`RETURN_FALSE;`
`492`	`492`	`}`
`493`	`493`	`if (MS_SQL_G(max_persistent) != -1 && MS_SQL_G(num_persistent) >= MS_SQL_G(max_persistent)) {`
`494`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%d)", MS_SQL_G(num_persistent));`
	`494`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%ld)", MS_SQL_G(num_persistent));`
`495`	`495`	`efree(hashed_details);`
`496`	`496`	`dbfreelogin(mssql.login);`
`497`	`497`	`RETURN_FALSE;`
`@@ -606,7 +606,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`	`if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) {`
`609`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links));`
	`609`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links));`
`610`	`610`	`efree(hashed_details);`
`611`	`611`	`RETURN_FALSE;`
`612`	`612`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2298,7 +2298,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)`
`2298`	`2298`	`cipher = EVP_des_ede3_cbc();`
`2299`	`2299`	`break;`
`2300`	`2300`	`default:`
`2301`		- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid cipher type `%d'", cipherid);
	`2301`	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid cipher type `%ld'", cipherid);
`2302`	`2302`	`goto clean_exit;`
`2303`	`2303`	`}`
`2304`	`2304`	`if (cipher == NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ PHP_FUNCTION(sem_get)`
`193`	`193`
`194`	`194`	`semid = semget(key, 3, perm\|IPC_CREAT);`
`195`	`195`	`if (semid == -1) {`
`196`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));`
	`196`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));`
`197`	`197`	`RETURN_FALSE;`
`198`	`198`	`}`
`199`	`199`
`@@ -225,7 +225,7 @@ PHP_FUNCTION(sem_get)`
`225`	`225`	`sop[2].sem_flg = SEM_UNDO;`
`226`	`226`	`while (semop(semid, sop, 3) == -1) {`
`227`	`227`	`if (errno != EINTR) {`
`228`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed acquiring SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno));`
	`228`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed acquiring SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno));`
`229`	`229`	`break;`
`230`	`230`	`}`
`231`	`231`	`}`
`@@ -237,7 +237,7 @@ PHP_FUNCTION(sem_get)`
`237`	`237`	`count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL);`
`238`	`238`	`#endif`
`239`	`239`	`if (count == -1) {`
`240`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));`
	`240`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`/* If we are the only user, then take this opportunity to set the max. */`
`@@ -248,17 +248,17 @@ PHP_FUNCTION(sem_get)`
`248`	`248`	`union semun semarg;`
`249`	`249`	`semarg.val = max_acquire;`
`250`	`250`	`if (semctl(semid, SYSVSEM_SEM, SETVAL, semarg) == -1) {`
`251`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));`
	`251`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));`
`252`	`252`	`}`
`253`	`253`	`#elif defined(SETVAL_WANTS_PTR)`
`254`	`254`	`/* This is correct for Solaris 2.6 which does not have union semun. */`
`255`	`255`	`if (semctl(semid, SYSVSEM_SEM, SETVAL, &max_acquire) == -1) {`
`256`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));`
	`256`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));`
`257`	`257`	`}`
`258`	`258`	`#else`
`259`	`259`	`/* This works for i.e. AIX */`
`260`	`260`	`if (semctl(semid, SYSVSEM_SEM, SETVAL, max_acquire) == -1) {`
`261`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", key, strerror(errno));`
	`261`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno));`
`262`	`262`	`}`
`263`	`263`	`#endif`
`264`	`264`	`}`
`@@ -270,7 +270,7 @@ PHP_FUNCTION(sem_get)`
`270`	`270`	`sop[0].sem_flg = SEM_UNDO;`
`271`	`271`	`while (semop(semid, sop, 1) == -1) {`
`272`	`272`	`if (errno != EINTR) {`
`273`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed releasing SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno));`
	`273`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed releasing SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno));`
`274`	`274`	`break;`
`275`	`275`	`}`
`276`	`276`	`}`
`@@ -307,7 +307,7 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire)`
`307`	`307`	`ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, arg_id, -1, "SysV semphore", php_sysvsem_module.le_sem);`
`308`	`308`
`309`	`309`	`if (!acquire && sem_ptr->count == 0) {`
`310`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %d (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key);`
	`310`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %ld (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key);`
`311`	`311`	`RETURN_FALSE;`
`312`	`312`	`}`
`313`	`313`
`@@ -317,7 +317,7 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire)`
`317`	`317`
`318`	`318`	`while (semop(sem_ptr->semid, &sop, 1) == -1) {`
`319`	`319`	`if (errno != EINTR) {`
`320`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", acquire ? "acquire" : "release", sem_ptr->key, strerror(errno));`
	`320`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to %s key 0x%x: %s", acquire ? "acquire" : "release", sem_ptr->key, strerror(errno));`
`321`	`321`	`RETURN_FALSE;`
`322`	`322`	`}`
`323`	`323`	`}`
`@@ -372,7 +372,7 @@ PHP_FUNCTION(sem_remove)`
`372`	`372`	`#else`
`373`	`373`	`if (semctl(sem_ptr->semid, 0, IPC_STAT, NULL) < 0) {`
`374`	`374`	`#endif`
`375`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %d does not (any longer) exist", Z_LVAL_PP(arg_id));`
	`375`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %ld does not (any longer) exist", Z_LVAL_PP(arg_id));`
`376`	`376`	`RETURN_FALSE;`
`377`	`377`	`}`
`378`	`378`
`@@ -381,7 +381,7 @@ PHP_FUNCTION(sem_remove)`
`381`	`381`	`#else`
`382`	`382`	`if (semctl(sem_ptr->semid, 0, IPC_RMID, NULL) < 0) {`
`383`	`383`	`#endif`
`384`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %d: %s", Z_LVAL_PP(arg_id), strerror(errno));`
	`384`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %ld: %s", Z_LVAL_PP(arg_id), strerror(errno));`
`385`	`385`	`RETURN_FALSE;`
`386`	`386`	`}`
`387`	`387`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ PHP_FUNCTION(shm_remove)`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`if (shmctl(shm_list_ptr->id, IPC_RMID,NULL) < 0) {`
`218`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x, id %i: %s", shm_list_ptr->key, id, strerror(errno));`
	`218`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x, id %ld: %s", shm_list_ptr->key, id, strerror(errno));`
`219`	`219`	`RETURN_FALSE;`
`220`	`220`	`}`
`221`	`221`
`@@ -246,7 +246,7 @@ PHP_FUNCTION(shm_put_var)`
`246`	`246`
`247`	`247`	`shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);`
`248`	`248`	`if (type != php_sysvshm.le_shm) {`
`249`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a SysV shared memory index", id);`
	`249`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);`
`250`	`250`	`RETURN_FALSE;`
`251`	`251`	`}`
`252`	`252`
`@@ -293,7 +293,7 @@ PHP_FUNCTION(shm_get_var)`
`293`	`293`
`294`	`294`	`shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);`
`295`	`295`	`if (type != php_sysvshm.le_shm) {`
`296`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a SysV shared memory index", id);`
	`296`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);`
`297`	`297`	`RETURN_FALSE;`
`298`	`298`	`}`
`299`	`299`
`@@ -302,7 +302,7 @@ PHP_FUNCTION(shm_get_var)`
`302`	`302`	`shm_varpos = php_check_shm_data((shm_list_ptr->ptr), key);`
`303`	`303`
`304`	`304`	`if (shm_varpos < 0) {`
`305`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %d doesn't exist", key);`
	`305`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %ld doesn't exist", key);`
`306`	`306`	`RETURN_FALSE;`
`307`	`307`	`}`
`308`	`308`	`shm_var = (sysvshm_chunk) ((char )shm_list_ptr->ptr + shm_varpos);`
`@@ -339,14 +339,14 @@ PHP_FUNCTION(shm_remove_var)`
`339`	`339`
`340`	`340`	`shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);`
`341`	`341`	`if (type != php_sysvshm.le_shm) {`
`342`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a SysV shared memory index", id);`
	`342`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);`
`343`	`343`	`RETURN_FALSE;`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`shm_varpos = php_check_shm_data((shm_list_ptr->ptr), key);`
`347`	`347`
`348`	`348`	`if (shm_varpos < 0) {`
`349`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %d doesn't exist", key);`
	`349`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %ld doesn't exist", key);`
`350`	`350`	`RETURN_FALSE;`
`351`	`351`	`}`
`352`	`352`	`php_remove_shm_data((shm_list_ptr->ptr), shm_varpos);`