tony2001 Tue Jun 26 21:37:14 2007 UTC
Modified files:
/php-src/ext/standard assert.c base64.c browscap.c credits.c
crypt.c css.c cyr_convert.c datetime.c
Log:
fix ws & folding
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/standard/assert.c
diff -u php-src/ext/standard/assert.c:1.73 php-src/ext/standard/assert.c:1.74
--- php-src/ext/standard/assert.c:1.73 Fri Feb 16 16:33:37 2007
+++ php-src/ext/standard/assert.c Tue Jun 26 21:37:14 2007
@@ -16,14 +16,16 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.73 2007/02/16 16:33:37 dmitry Exp $ */
+/* $Id: assert.c,v 1.74 2007/06/26 21:37:14 tony2001 Exp $ */
-/* {{{ includes/startup/misc */
+/* {{{ includes */
#include "php.h"
#include "php_assert.h"
#include "php_ini.h"
+/* }}} */
+
ZEND_BEGIN_MODULE_GLOBALS(assert)
long active;
long bail;
@@ -51,7 +53,7 @@
ASSERT_QUIET_EVAL
};
-static PHP_INI_MH(OnChangeCallback)
+static PHP_INI_MH(OnChangeCallback) /* {{{ */
{
if (EG(in_execution)) {
if (ASSERTG(callback)) {
@@ -75,6 +77,7 @@
}
return SUCCESS;
}
+/* }}} */
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("assert.active", "1", PHP_INI_ALL,
OnUpdateLong, active, zend_assert_globals,
assert_globals)
@@ -84,13 +87,14 @@
STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL,
OnUpdateLong, quiet_eval, zend_assert_globals,
assert_globals)
PHP_INI_END()
-static void php_assert_init_globals(zend_assert_globals *assert_globals_p
TSRMLS_DC)
+static void php_assert_init_globals(zend_assert_globals *assert_globals_p
TSRMLS_DC) /* {{{ */
{
assert_globals_p->callback = NULL;
assert_globals_p->cb = NULL;
}
+/* }}} */
-PHP_MINIT_FUNCTION(assert)
+PHP_MINIT_FUNCTION(assert) /* {{{ */
{
ZEND_INIT_MODULE_GLOBALS(assert, php_assert_init_globals, NULL);
@@ -104,8 +108,9 @@
return SUCCESS;
}
+/* }}} */
-PHP_MSHUTDOWN_FUNCTION(assert)
+PHP_MSHUTDOWN_FUNCTION(assert) /* {{{ */
{
if (ASSERTG(cb)) {
pefree(ASSERTG(cb), 1);
@@ -113,8 +118,9 @@
}
return SUCCESS;
}
+/* }}} */
-PHP_RSHUTDOWN_FUNCTION(assert)
+PHP_RSHUTDOWN_FUNCTION(assert) /* {{{ */
{
if (ASSERTG(callback)) {
zval_ptr_dtor(&ASSERTG(callback));
@@ -123,15 +129,14 @@
return SUCCESS;
}
+/* }}} */
-PHP_MINFO_FUNCTION(assert)
+PHP_MINFO_FUNCTION(assert) /* {{{ */
{
DISPLAY_INI_ENTRIES();
}
-
-/* }}} */
-/* {{{ internal functions */
/* }}} */
+
/* {{{ proto int assert(string|bool assertion) U
Checks if assertion is false */
@@ -256,6 +261,7 @@
}
/* }}} */
+
/* {{{ proto mixed assert_options(int what [, mixed value]) U
Set/get the various assert flags */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.51&r2=1.52&diff_format=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.51 php-src/ext/standard/base64.c:1.52
--- php-src/ext/standard/base64.c:1.51 Mon Jan 1 09:29:30 2007
+++ php-src/ext/standard/base64.c Tue Jun 26 21:37:14 2007
@@ -15,14 +15,14 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: base64.c,v 1.51 2007/01/01 09:29:30 sebastian Exp $ */
+/* $Id: base64.c,v 1.52 2007/06/26 21:37:14 tony2001 Exp $ */
#include <string.h>
#include "php.h"
#include "base64.h"
-/* {{{ */
+/* {{{ base64 tables */
static const char base64_table[] =
{ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
@@ -53,8 +53,7 @@
};
/* }}} */
-/* {{{ php_base64_encode */
-PHPAPI unsigned char *php_base64_encode(const unsigned char *str, int length,
int *ret_length)
+PHPAPI unsigned char *php_base64_encode(const unsigned char *str, int length,
int *ret_length) /* {{{ */
{
const unsigned char *current = str;
unsigned char *p;
@@ -135,14 +134,13 @@
*/
/* }}} */
-PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length,
int *ret_length)
+PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length,
int *ret_length) /* {{{ */
{
return php_base64_decode_ex(str, length, ret_length, 0);
}
+/* }}} */
-/* {{{ php_base64_decode */
-/* as above, but backwards. :) */
-PHPAPI unsigned char *php_base64_decode_ex(const unsigned char *str, int
length, int *ret_length, zend_bool strict)
+PHPAPI unsigned char *php_base64_decode_ex(const unsigned char *str, int
length, int *ret_length, zend_bool strict) /* {{{ */
{
const unsigned char *current = str;
int ch, i = 0, j = 0, k;
@@ -223,7 +221,6 @@
}
/* }}} */
-
/* {{{ proto binary base64_decode(binary str[, bool strict]) U
Decodes string using MIME base64 algorithm */
PHP_FUNCTION(base64_decode)
@@ -245,7 +242,6 @@
}
/* }}} */
-
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.92&r2=1.93&diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.92
php-src/ext/standard/browscap.c:1.93
--- php-src/ext/standard/browscap.c:1.92 Mon May 28 23:00:25 2007
+++ php-src/ext/standard/browscap.c Tue Jun 26 21:37:14 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.92 2007/05/28 23:00:25 iliaa Exp $ */
+/* $Id: browscap.c,v 1.93 2007/06/26 21:37:14 tony2001 Exp $ */
#include "php.h"
#include "php_regex.h"
@@ -33,7 +33,7 @@
/* OBJECTS_FIXME: This whole extension needs going through. The use of objects
looks pretty broken here */
-static void browscap_entry_dtor(zval **zvalue)
+static void browscap_entry_dtor(zval **zvalue) /* {{{ */
{
if (Z_TYPE_PP(zvalue) == IS_ARRAY) {
zend_hash_destroy(Z_ARRVAL_PP(zvalue));
@@ -45,10 +45,9 @@
}
free(*zvalue);
}
+/* }}} */
-/* {{{ convert_browscap_pattern
- */
-static void convert_browscap_pattern(zval *pattern)
+static void convert_browscap_pattern(zval *pattern) /* {{{ */
{
register int i, j;
char *t;
@@ -86,9 +85,7 @@
}
/* }}} */
-/* {{{ php_browscap_parser_cb
- */
-static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type,
void *arg)
+static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type,
void *arg) /* {{{ */
{
if (!arg1) {
return;
@@ -148,9 +145,7 @@
}
/* }}} */
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(browscap)
+PHP_MINIT_FUNCTION(browscap) /* {{{ */
{
char *browscap = INI_STR("browscap");
@@ -178,9 +173,7 @@
}
/* }}} */
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(browscap)
+PHP_MSHUTDOWN_FUNCTION(browscap) /* {{{ */
{
char *browscap = INI_STR("browscap");
if (browscap && browscap[0]) {
@@ -190,10 +183,7 @@
}
/* }}} */
-
-/* {{{ browser_reg_compare
- */
-static int browser_reg_compare(zval **browser, int num_args, va_list args,
zend_hash_key *key)
+static int browser_reg_compare(zval **browser, int num_args, va_list args,
zend_hash_key *key) /* {{{ */
{
zval **browser_regex, **previous_match;
regex_t r;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.46&r2=1.47&diff_format=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.46 php-src/ext/standard/credits.c:1.47
--- php-src/ext/standard/credits.c:1.46 Tue May 22 15:46:27 2007
+++ php-src/ext/standard/credits.c Tue Jun 26 21:37:14 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: credits.c,v 1.46 2007/05/22 15:46:27 bjori Exp $ */
+/* $Id: credits.c,v 1.47 2007/06/26 21:37:14 tony2001 Exp $ */
#include "php.h"
#include "info.h"
@@ -28,9 +28,7 @@
#define CREDIT_LINE(module, authors) php_info_print_table_row(2, module,
authors)
#define CREDIT_PUTS(s) php_output_write_utf8((s), strlen(s) TSRMLS_CC)
-/* {{{ php_print_credits
- */
-PHPAPI void php_print_credits(int flag TSRMLS_DC)
+PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */
{
if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) {
php_print_info_htmlhead(TSRMLS_C);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.70&r2=1.71&diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.70 php-src/ext/standard/crypt.c:1.71
--- php-src/ext/standard/crypt.c:1.70 Mon Jan 1 09:29:31 2007
+++ php-src/ext/standard/crypt.c Tue Jun 26 21:37:14 2007
@@ -17,7 +17,7 @@
| Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: crypt.c,v 1.70 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: crypt.c,v 1.71 2007/06/26 21:37:14 tony2001 Exp $ */
#include <stdlib.h>
#include "php.h"
@@ -92,7 +92,7 @@
#define PHP_CRYPT_RAND php_rand(TSRMLS_C)
-PHP_MINIT_FUNCTION(crypt)
+PHP_MINIT_FUNCTION(crypt) /* {{{ */
{
REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", PHP_MAX_SALT_LEN, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS |
CONST_PERSISTENT);
@@ -102,17 +102,18 @@
return SUCCESS;
}
-
+/* }}} */
static unsigned char itoa64[] =
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-static void php_to64(char *s, long v, int n)
+static void php_to64(char *s, long v, int n) /* {{{ */
{
while (--n >= 0) {
*s++ = itoa64[v&0x3f];
v >>= 6;
}
}
+/* }}} */
/* {{{ proto string crypt(string str [, string salt]) U
Hash a string */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/css.c?r1=1.15&r2=1.16&diff_format=u
Index: php-src/ext/standard/css.c
diff -u php-src/ext/standard/css.c:1.15 php-src/ext/standard/css.c:1.16
--- php-src/ext/standard/css.c:1.15 Mon Jan 1 09:29:31 2007
+++ php-src/ext/standard/css.c Tue Jun 26 21:37:14 2007
@@ -16,15 +16,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: css.c,v 1.15 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: css.c,v 1.16 2007/06/26 21:37:14 tony2001 Exp $ */
#include "php.h"
#include "info.h"
-
-/* {{{ php_info_print_css
- */
-PHPAPI void php_info_print_css(TSRMLS_D)
+PHPAPI void php_info_print_css(TSRMLS_D) /* {{{ */
{
PUTS("body {background-color: #ffffff; color: #000000;}\n");
PUTS("body, td, th, h1, h2 {font-family: sans-serif;}\n");
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/cyr_convert.c?r1=1.32&r2=1.33&diff_format=u
Index: php-src/ext/standard/cyr_convert.c
diff -u php-src/ext/standard/cyr_convert.c:1.32
php-src/ext/standard/cyr_convert.c:1.33
--- php-src/ext/standard/cyr_convert.c:1.32 Mon Jan 1 09:29:31 2007
+++ php-src/ext/standard/cyr_convert.c Tue Jun 26 21:37:14 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cyr_convert.c,v 1.32 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: cyr_convert.c,v 1.33 2007/06/26 21:37:14 tony2001 Exp $ */
#include <stdlib.h>
@@ -187,7 +187,7 @@
};
/* }}} */
-/* {{{ php_convert_cyr_string
+/* {{{ static char * php_convert_cyr_string(unsigned char *str, int length,
char from, char to TSRMLS_DC)
* This is the function that performs real in-place conversion of the string
* between charsets.
* Parameters:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/datetime.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.145
php-src/ext/standard/datetime.c:1.146
--- php-src/ext/standard/datetime.c:1.145 Thu Jun 7 08:58:38 2007
+++ php-src/ext/standard/datetime.c Tue Jun 26 21:37:14 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.c,v 1.145 2007/06/07 08:58:38 tony2001 Exp $ */
+/* $Id: datetime.c,v 1.146 2007/06/26 21:37:14 tony2001 Exp $ */
#include "php.h"
#include "zend_operators.h"
@@ -49,7 +49,7 @@
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};
-/* {{{ php_std_date
+/* {{{ PHPAPI char *php_std_date(time_t t TSRMLS_DC)
Return date string in standard format for http headers */
PHPAPI char *php_std_date(time_t t TSRMLS_DC)
{
@@ -85,7 +85,6 @@
}
/* }}} */
-
#if HAVE_STRPTIME
#ifndef HAVE_STRPTIME_DECL_FAILS
char *strptime(const char *s, const char *format, struct tm *tm);
@@ -155,6 +154,7 @@
}
}
/* }}} */
+
#endif
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
