From b303ba089ca0255f4ced082e9ca2908d2b3dade4 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 8 Mar 2004 23:11:45 +0000 Subject: [PATCH] More wordsize fixes --- ext/sqlite/libsqlite/src/main.c | 2 +- ext/sqlite/libsqlite/src/table.c | 2 +- ext/sqlite/libsqlite/src/vdbeaux.c | 4 ++-- ext/standard/datetime.c | 3 ++- ext/standard/var.c | 2 +- main/spprintf.c | 2 +- main/streams/userspace.c | 8 ++++---- main/streams/xp_socket.c | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ext/sqlite/libsqlite/src/main.c b/ext/sqlite/libsqlite/src/main.c index e2b269738b..f79f266293 100644 --- a/ext/sqlite/libsqlite/src/main.c +++ b/ext/sqlite/libsqlite/src/main.c @@ -856,7 +856,7 @@ void sqlite_progress_handler( ** This routine installs a default busy handler that waits for the ** specified number of milliseconds before returning 0. */ -void sqlite_busy_timeout(sqlite *db, int ms){ +void sqlite_busy_timeout(sqlite *db, long ms){ if( ms>0 ){ sqlite_busy_handler(db, sqliteDefaultBusyCallback, (void*)ms); }else{ diff --git a/ext/sqlite/libsqlite/src/table.c b/ext/sqlite/libsqlite/src/table.c index dc2d9fa7e5..48c852d487 100644 --- a/ext/sqlite/libsqlite/src/table.c +++ b/ext/sqlite/libsqlite/src/table.c @@ -31,7 +31,7 @@ typedef struct TabResult { int nAlloc; int nRow; int nColumn; - int nData; + long nData; int rc; } TabResult; diff --git a/ext/sqlite/libsqlite/src/vdbeaux.c b/ext/sqlite/libsqlite/src/vdbeaux.c index 6249a29f0b..087128cbbc 100644 --- a/ext/sqlite/libsqlite/src/vdbeaux.c +++ b/ext/sqlite/libsqlite/src/vdbeaux.c @@ -471,7 +471,7 @@ void sqliteVdbePrintOp(FILE *pOut, int pc, Op *pOp){ char *zP3; char zPtr[40]; if( pOp->p3type==P3_POINTER ){ - sprintf(zPtr, "ptr(%#x)", (int)pOp->p3); + sprintf(zPtr, "ptr(%#lx)", (long)pOp->p3); zP3 = zPtr; }else{ zP3 = pOp->p3; @@ -522,7 +522,7 @@ int sqliteVdbeList( sprintf(p->zStack[2],"%d", p->aOp[i].p1); sprintf(p->zStack[3],"%d", p->aOp[i].p2); if( p->aOp[i].p3type==P3_POINTER ){ - sprintf(p->aStack[4].z, "ptr(%#x)", (int)p->aOp[i].p3); + sprintf(p->aStack[4].z, "ptr(%#lx)", (long)p->aOp[i].p3); p->zStack[4] = p->aStack[4].z; }else{ p->zStack[4] = p->aOp[i].p3; diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index 32441fc83a..82b06fb6d1 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -83,7 +83,8 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm) struct tm *ta, tmbuf; time_t t, seconds; int i, gmadjust, arg_count = ZEND_NUM_ARGS(); - int is_dst = -1, val, chgsecs = 0; + int is_dst = -1, chgsecs = 0; + long val; if (arg_count > 7 || zend_get_parameters_array_ex(arg_count, arguments) == FAILURE) { WRONG_PARAM_COUNT; diff --git a/ext/standard/var.c b/ext/standard/var.c index 3fd9b4c364..f0f5583dca 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -740,7 +740,7 @@ PHP_FUNCTION(unserialize) if (!php_var_unserialize(&return_value, &p, p + Z_STRLEN_PP(buf), &var_hash TSRMLS_CC)) { PHP_VAR_UNSERIALIZE_DESTROY(var_hash); zval_dtor(return_value); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Error at offset %d of %d bytes", p - Z_STRVAL_PP(buf), Z_STRLEN_PP(buf)); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Error at offset %ld of %d bytes", (long)(p - Z_STRVAL_PP(buf)), Z_STRLEN_PP(buf)); RETURN_FALSE; } PHP_VAR_UNSERIALIZE_DESTROY(var_hash); diff --git a/main/spprintf.c b/main/spprintf.c index 27336f7cf5..31211f3bb0 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -149,7 +149,7 @@ while (isdigit((int)*str)) { \ num *= 10; \ num += NUM(*str++); \ - if (num >= LONG_MAX / 10) { \ + if (num >= INT_MAX / 10) { \ while (isdigit((int)*str++)); \ break; \ } \ diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 5f0ffe8b48..cf1c4d4c1e 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -469,9 +469,9 @@ static size_t php_userstreamop_write(php_stream *stream, const char *buf, size_t /* don't allow strange buffer overruns due to bogus return */ if (didwrite > count) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_WRITE " wrote %zd bytes more data than requested (%zd written, %zd max)", + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_WRITE " wrote %ld bytes more data than requested (%ld written, %ld max)", us->wrapper->classname, - didwrite - count, didwrite, count); + (long)(didwrite - count), (long)didwrite, (long)count); didwrite = count; } @@ -510,8 +510,8 @@ static size_t php_userstreamop_read(php_stream *stream, char *buf, size_t count convert_to_string(retval); didread = Z_STRLEN_P(retval); if (didread > count) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_READ " - read %zd bytes more data than requested (%zd read, %zd max) - excess data will be lost", - us->wrapper->classname, didread - count, didread, count); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_READ " - read %ld bytes more data than requested (%ld read, %ld max) - excess data will be lost", + us->wrapper->classname, (long)(didread - count), (long)didread, (long)count); didread = count; } if (didread > 0) diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index d70a9c79ba..d6fb72257e 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -57,8 +57,8 @@ static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count if (didwrite <= 0) { char *estr = php_socket_strerror(php_socket_errno(), NULL, 0); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "send of %d bytes failed with errno=%d %s", - count, php_socket_errno(), estr); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "send of %ld bytes failed with errno=%d %s", + (long)count, php_socket_errno(), estr); efree(estr); } -- 2.40.0