tony2001 Wed Aug 8 22:32:25 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard file.c
Log:
fix ws & folding
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.21&r2=1.409.2.6.2.22&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.21
php-src/ext/standard/file.c:1.409.2.6.2.22
--- php-src/ext/standard/file.c:1.409.2.6.2.21 Sun Jul 1 21:28:16 2007
+++ php-src/ext/standard/file.c Wed Aug 8 22:32:24 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.409.2.6.2.21 2007/07/01 21:28:16 sniper Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.22 2007/08/08 22:32:24 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -146,6 +146,7 @@
}
/* }}} */
+
/* {{{ Module-Stuff */
static ZEND_RSRC_DTOR_FUNC(file_context_dtor)
@@ -302,15 +303,14 @@
/* }}} */
-PHP_MSHUTDOWN_FUNCTION(file)
+PHP_MSHUTDOWN_FUNCTION(file) /* {{{ */
{
#ifndef ZTS
file_globals_dtor(&file_globals TSRMLS_CC);
#endif
return SUCCESS;
}
-
-
+/* }}} */
/* {{{ proto bool flock(resource fp, int operation [, int &wouldblock])
Portable file locking */
@@ -1387,10 +1387,7 @@
/* }}} */
-/* {{{ proto int mkdir(char *dir int mode)
-*/
-
-PHPAPI int php_mkdir_ex(char *dir, long mode, int options TSRMLS_DC)
+PHPAPI int php_mkdir_ex(char *dir, long mode, int options TSRMLS_DC) /* {{{ */
{
int ret;
@@ -1741,10 +1738,11 @@
}
/* }}} */
-PHPAPI int php_copy_file(char *src, char *dest TSRMLS_DC)
+PHPAPI int php_copy_file(char *src, char *dest TSRMLS_DC) /* {{{ */
{
return php_copy_file_ex(src, dest, ENFORCE_SAFE_MODE TSRMLS_CC);
}
+/* }}} */
/* {{{ php_copy_file
*/
@@ -1859,7 +1857,7 @@
}
/* }}} */
-static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t
len, const char delimiter TSRMLS_DC)
+static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t
len, const char delimiter TSRMLS_DC) /* {{{ */
{
int inc_len;
unsigned char last_chars[2] = { 0, 0 };
@@ -1895,6 +1893,7 @@
}
return ptr;
}
+/* }}} */
#define FPUTCSV_FLD_CHK(c) memchr(Z_STRVAL_PP(field), c, Z_STRLEN_PP(field))
@@ -2090,11 +2089,7 @@
}
/* }}} */
-
-PHPAPI void php_fgetcsv(php_stream *stream, /* {{{ */
- char delimiter, char enclosure,
- size_t buf_len, char *buf,
- zval *return_value TSRMLS_DC)
+PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure,
size_t buf_len, char *buf, zval *return_value TSRMLS_DC) /* {{{ */
{
char *temp, *tptr, *bptr, *line_end, *limit;
const char escape_char = '\\';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
