[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com pecl/networking/ssh2: datatype and signature fixes: ssh2.c =?UTF-8?Q?ssh=32=5Ffopen=5
From:       Anatol Belski <ab () php ! net>
Date:       2016-07-03 16:09:16
Message-ID: php-mail-bd739e404fcb3d7d798d61c9bb02a3fc621062638 () git ! php ! net
[Download RAW message or body]

Commit:    8417a6cf84dcff68da1ab8380b3891bff5bfad62
Author:    Anatol Belski <ab@php.net>         Sun, 3 Jul 2016 18:09:16 +0200
Parents:   dbf1b3c1c9e0d8b24906867d668e5bee994ac92d
Branches:  master

Link:       http://git.php.net/?p=pecl/networking/ssh2.git;a=commitdiff;h=8417a6cf84dcff68da1ab8380b3891bff5bfad62


Log:
datatype and signature fixes

Changed paths:
  M  ssh2.c
  M  ssh2_fopen_wrappers.c
  M  ssh2_sftp.c


Diff:
diff --git a/ssh2.c b/ssh2.c
index 1bfff9b..09d6d55 100644
--- a/ssh2.c
+++ b/ssh2.c
@@ -1019,7 +1019,7 @@ PHP_FUNCTION(ssh2_publickey_add)
 			zend_hash_move_forward_ex(Z_ARRVAL_P(zattrs), &pos)) {
 			zend_string *key;
 			int type;
-			ulong idx;
+			zend_ulong idx;
 			zval copyval = *attr_val;
 
 			type = zend_hash_get_current_key_ex(Z_ARRVAL_P(zattrs), &key, &idx, &pos);
diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
index 93c816d..ef115ba 100644
--- a/ssh2_fopen_wrappers.c
+++ b/ssh2_fopen_wrappers.c
@@ -501,7 +501,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, \
int resource_id  if (environment) {
 		zend_string *key;
 		int key_type;
-		ulong idx;
+		zend_ulong idx;
 
 		for(zend_hash_internal_pointer_reset(HASH_OF(environment));
 			(key_type = zend_hash_get_current_key_ex(HASH_OF(environment), &key, &idx, NULL)) \
!= HASH_KEY_NON_EXISTENT; @@ -569,9 +569,9 @@ static php_stream \
*php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con  php_stream *stream;
 	zval *tmpzval, *environment = NULL;
 	char *terminal = PHP_SSH2_DEFAULT_TERMINAL;
-	long width = PHP_SSH2_DEFAULT_TERM_WIDTH;
-	long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
-	long type = PHP_SSH2_DEFAULT_TERM_UNIT;
+	zend_long width = PHP_SSH2_DEFAULT_TERM_WIDTH;
+	zend_long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
+	zend_long type = PHP_SSH2_DEFAULT_TERM_UNIT;
 	int resource_id = 0, terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1;
 	php_url *resource;
 	char *s;
@@ -739,7 +739,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION \
*session, int resource_  if (environment) {
 		zend_string *key = NULL;
 		int key_type;
-		ulong idx = 0;
+		zend_ulong idx = 0;
 		HashPosition pos;
 
 		for(zend_hash_internal_pointer_reset_ex(HASH_OF(environment), &pos);
diff --git a/ssh2_sftp.c b/ssh2_sftp.c
index 3dc181d..c5172dd 100644
--- a/ssh2_sftp.c
+++ b/ssh2_sftp.c
@@ -149,7 +149,7 @@ static int php_ssh2_sftp_stream_close(php_stream *stream, int \
close_handle TSRML  
 /* {{{ php_ssh2_sftp_stream_seek
  */
-static int php_ssh2_sftp_stream_seek(php_stream *stream, off_t offset, int whence, \
off_t *newoffset TSRMLS_DC) +static int php_ssh2_sftp_stream_seek(php_stream *stream, \
zend_off_t offset, int whence, zend_off_t *newoffset TSRMLS_DC)  {
 	php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract;
 
@@ -168,7 +168,7 @@ static int php_ssh2_sftp_stream_seek(php_stream *stream, off_t \
offset, int whenc  }
 		case SEEK_CUR:
 		{
-			off_t current_offset = libssh2_sftp_tell(data->handle);
+			zend_off_t current_offset = libssh2_sftp_tell(data->handle);
 
 			if (current_offset < 0) {
 				return -1;


--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]