jani Thu Sep 27 13:16:09 2007 UTC
Modified files:
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
MFB52: cs+ws (and synced the folding wrap style!)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.97
php-src/ext/standard/ftp_fopen_wrapper.c:1.98
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.97 Fri Sep 21 12:57:23 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.c Thu Sep 27 13:16:09 2007
@@ -18,7 +18,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.97 2007/09/21 12:57:23 tony2001 Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.98 2007/09/27 13:16:09 jani Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -69,8 +69,12 @@
#include "php_fopen_wrappers.h"
+#define FTPS_ENCRYPT_DATA 1
+#define GET_FTP_RESULT(stream) get_ftp_result((stream), tmp_line,
sizeof(tmp_line) TSRMLS_CC)
-static inline int get_ftp_result(php_stream *stream, char *buffer, size_t
buffer_size TSRMLS_DC) /* {{{ */
+/* {{{ get_ftp_result
+ */
+static inline int get_ftp_result(php_stream *stream, char *buffer, size_t
buffer_size TSRMLS_DC)
{
while (php_stream_gets(stream, ZSTR(buffer), buffer_size-1) &&
!(isdigit((int) buffer[0]) && isdigit((int) buffer[1]) &&
@@ -78,11 +82,10 @@
return strtol(buffer, NULL, 10);
}
/* }}} */
-#define GET_FTP_RESULT(stream) get_ftp_result((stream), tmp_line,
sizeof(tmp_line) TSRMLS_CC)
-#define FTPS_ENCRYPT_DATA 1
-
-static int php_stream_ftp_stream_stat(php_stream_wrapper *wrapper, php_stream
*stream, php_stream_statbuf *ssb TSRMLS_DC) /* {{{ */
+/* {{{ php_stream_ftp_stream_stat
+ */
+static int php_stream_ftp_stream_stat(php_stream_wrapper *wrapper, php_stream
*stream, php_stream_statbuf *ssb TSRMLS_DC)
{
/* For now, we return with a failure code to prevent the underlying
* file's details from being used instead. */
@@ -90,7 +93,9 @@
}
/* }}} */
-static int php_stream_ftp_stream_close(php_stream_wrapper *wrapper, php_stream
*stream TSRMLS_DC) /* {{{ */
+/* {{{ php_stream_ftp_stream_close
+ */
+static int php_stream_ftp_stream_close(php_stream_wrapper *wrapper, php_stream
*stream TSRMLS_DC)
{
php_stream *controlstream = (php_stream *)stream->wrapperdata;
@@ -561,7 +566,7 @@
php_url_free(resource);
return datastream;
- errexit:
+errexit:
if (resource) {
php_url_free(resource);
}
@@ -725,7 +730,7 @@
php_url_free(resource);
return php_stream_alloc(&php_ftp_dirstream_ops, datastream, 0, mode);
- opendir_errexit:
+opendir_errexit:
if (resource) {
php_url_free(resource);
}
@@ -825,7 +830,7 @@
#endif
} else {
/* error or unsupported command */
- mdtm_error:
+mdtm_error:
#ifdef NETWARE
ssb->sb.st_mtime.tv_sec = -1;
#else
@@ -857,7 +862,7 @@
php_url_free(resource);
return 0;
- stat_errexit:
+stat_errexit:
if (resource) {
php_url_free(resource);
}
@@ -907,7 +912,7 @@
php_stream_close(stream);
return 1;
- unlink_errexit:
+unlink_errexit:
if (resource) {
php_url_free(resource);
}
@@ -983,7 +988,7 @@
php_stream_close(stream);
return 1;
- rename_errexit:
+rename_errexit:
if (resource_from) {
php_url_free(resource_from);
}
@@ -1080,7 +1085,7 @@
return 1;
- mkdir_errexit:
+mkdir_errexit:
if (resource) {
php_url_free(resource);
}
@@ -1130,7 +1135,7 @@
return 1;
- rmdir_errexit:
+rmdir_errexit:
if (resource) {
php_url_free(resource);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
