Merge pull request #102 from sunpoet/master

eduardok · web-flow · commit 6d993db9347e · 2023-09-11T11:03:40.000-04:00
Fix build error and warning on i386
diff --git a/smb_streams.c b/smb_streams.c
@@ -270,7 +270,7 @@ static int php_smb_ops_stat(php_stream *stream, php_stream_statbuf *ssb TSRMLS_D
 	return 0;
 }
 
-static int php_smb_ops_seek(php_stream *stream, off_t offset, int whence, off_t *newoffset TSRMLS_DC)
+static int php_smb_ops_seek(php_stream *stream, zend_off_t offset, int whence, zend_off_t *newoffset TSRMLS_DC)
 {
 	STREAM_DATA_FROM_STREAM();
 
diff --git a/smbclient.c b/smbclient.c
@@ -1202,7 +1202,7 @@ PHP_FUNCTION(smbclient_read)
 		return;
 	}
 	if (count < 0) {
-		php_error(E_WARNING, "Negative byte count: %ld", count);
+		php_error(E_WARNING, "Negative byte count: " ZEND_LONG_FMT, count);
 		RETURN_FALSE;
 	}
 	STATE_FROM_ZSTATE;
@@ -1253,7 +1253,7 @@ PHP_FUNCTION(smbclient_write)
 		return;
 	}
 	if (count < 0) {
-		php_error(E_WARNING, "Negative byte count: %ld", count);
+		php_error(E_WARNING, "Negative byte count: " ZEND_LONG_FMT, count);
 		RETURN_FALSE;
 	}
 	if (count == 0 || count > str_len) {

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ static int php_smb_ops_stat(php_stream stream, php_stream_statbuf ssb TSRMLS_D`
`270`	`270`	`return 0;`
`271`	`271`	`}`
`272`	`272`
`273`		`-static int php_smb_ops_seek(php_stream stream, off_t offset, int whence, off_t newoffset TSRMLS_DC)`
	`273`	`+static int php_smb_ops_seek(php_stream stream, zend_off_t offset, int whence, zend_off_t newoffset TSRMLS_DC)`
`274`	`274`	`{`
`275`	`275`	`STREAM_DATA_FROM_STREAM();`
`276`	`276`
Original file line number	Diff line number	Diff line change
`@@ -1202,7 +1202,7 @@ PHP_FUNCTION(smbclient_read)`
`1202`	`1202`	`return;`
`1203`	`1203`	`}`
`1204`	`1204`	`if (count < 0) {`
`1205`		`- php_error(E_WARNING, "Negative byte count: %ld", count);`
	`1205`	`+ php_error(E_WARNING, "Negative byte count: " ZEND_LONG_FMT, count);`
`1206`	`1206`	`RETURN_FALSE;`
`1207`	`1207`	`}`
`1208`	`1208`	`STATE_FROM_ZSTATE;`
`@@ -1253,7 +1253,7 @@ PHP_FUNCTION(smbclient_write)`
`1253`	`1253`	`return;`
`1254`	`1254`	`}`
`1255`	`1255`	`if (count < 0) {`
`1256`		`- php_error(E_WARNING, "Negative byte count: %ld", count);`
	`1256`	`+ php_error(E_WARNING, "Negative byte count: " ZEND_LONG_FMT, count);`
`1257`	`1257`	`RETURN_FALSE;`
`1258`	`1258`	`}`
`1259`	`1259`	`if (count == 0 \|\| count > str_len) {`