summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/assert.c12
-rw-r--r--ext/standard/basic_functions.c20
-rw-r--r--ext/standard/fsock.c14
3 files changed, 23 insertions, 23 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 062b15f8b6..8f21a7735c 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -25,10 +25,10 @@
/* }}} */
ZEND_BEGIN_MODULE_GLOBALS(assert)
- long active;
- long bail;
- long warning;
- long quiet_eval;
+ php_int_t active;
+ php_int_t bail;
+ php_int_t warning;
+ php_int_t quiet_eval;
zval callback;
char *cb;
ZEND_END_MODULE_GLOBALS(assert)
@@ -256,12 +256,12 @@ PHP_FUNCTION(assert)
PHP_FUNCTION(assert_options)
{
zval *value = NULL;
- long what;
+ php_int_t what;
int oldint;
int ac = ZEND_NUM_ARGS();
zend_string *key;
- if (zend_parse_parameters(ac TSRMLS_CC, "l|z", &what, &value) == FAILURE) {
+ if (zend_parse_parameters(ac TSRMLS_CC, "i|z", &what, &value) == FAILURE) {
return;
}
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4137823257..69e85a5aa6 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4626,9 +4626,9 @@ PHP_FUNCTION(error_log)
char *message, *opt = NULL, *headers = NULL;
int message_len, opt_len = 0, headers_len = 0;
int opt_err = 0, argc = ZEND_NUM_ARGS();
- long erropt = 0;
+ php_int_t erropt = 0;
- if (zend_parse_parameters(argc TSRMLS_CC, "s|lps", &message, &message_len, &erropt, &opt, &opt_len, &headers, &headers_len) == FAILURE) {
+ if (zend_parse_parameters(argc TSRMLS_CC, "s|ips", &message, &message_len, &erropt, &opt, &opt_len, &headers, &headers_len) == FAILURE) {
return;
}
@@ -5526,10 +5526,10 @@ PHP_FUNCTION(getservbyport)
{
char *proto;
int proto_len;
- long port;
+ php_int_t port;
struct servent *serv;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &port, &proto, &proto_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "is", &port, &proto, &proto_len) == FAILURE) {
return;
}
@@ -5573,10 +5573,10 @@ PHP_FUNCTION(getprotobyname)
Returns protocol name associated with protocol number proto */
PHP_FUNCTION(getprotobynumber)
{
- long proto;
+ php_int_t proto;
struct protoent *ent;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &proto) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &proto) == FAILURE) {
return;
}
@@ -5839,11 +5839,11 @@ PHP_FUNCTION(parse_ini_file)
char *filename = NULL;
int filename_len = 0;
zend_bool process_sections = 0;
- long scanner_mode = ZEND_INI_SCANNER_NORMAL;
+ php_int_t scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_file_handle fh;
zend_ini_parser_cb_t ini_parser_cb;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|bl", &filename, &filename_len, &process_sections, &scanner_mode) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|bi", &filename, &filename_len, &process_sections, &scanner_mode) == FAILURE) {
RETURN_FALSE;
}
@@ -5880,10 +5880,10 @@ PHP_FUNCTION(parse_ini_string)
char *string = NULL, *str = NULL;
int str_len = 0;
zend_bool process_sections = 0;
- long scanner_mode = ZEND_INI_SCANNER_NORMAL;
+ php_int_t scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bl", &str, &str_len, &process_sections, &scanner_mode) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bi", &str, &str_len, &process_sections, &scanner_mode) == FAILURE) {
RETURN_FALSE;
}
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 17163b0234..72f892b60b 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -33,7 +33,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{
char *host;
int host_len;
- long port = -1;
+ php_int_t port = -1;
zval *zerrno = NULL, *zerrstr = NULL;
double timeout = FG(default_socket_timeout);
php_uint_t conv;
@@ -42,28 +42,28 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
php_stream *stream = NULL;
int err;
char *hostname = NULL;
- long hostname_len;
+ php_int_t hostname_len;
zend_string *errstr = NULL;
RETVAL_FALSE;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/z/d", &host, &host_len, &port, &zerrno, &zerrstr, &timeout) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|iz/z/d", &host, &host_len, &port, &zerrno, &zerrstr, &timeout) == FAILURE) {
RETURN_FALSE;
}
if (persistent) {
- spprintf(&hashkey, 0, "pfsockopen__%s:%ld", host, port);
+ spprintf(&hashkey, 0, "pfsockopen__%s:" ZEND_INT_FMT, host, port);
}
if (port > 0) {
- hostname_len = spprintf(&hostname, 0, "%s:%ld", host, port);
+ hostname_len = spprintf(&hostname, 0, "%s:" ZEND_INT_FMT, host, port);
} else {
hostname_len = host_len;
hostname = host;
}
/* prepare the timeout value for use */
- conv = (php_uint_t) (timeout * 1000000.0);
+ conv = (unsigned long) (timeout * 1000000.0);
tv.tv_sec = conv / 1000000;
tv.tv_usec = conv % 1000000;
@@ -83,7 +83,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
efree(hostname);
}
if (stream == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to connect to %s:%ld (%s)", host, port, errstr == NULL ? "Unknown error" : errstr->val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to connect to %s:" ZEND_INT_FMT " (%s)", host, port, errstr == NULL ? "Unknown error" : errstr->val);
}
if (hashkey) {
View Lorry Controller Status