jani Mon Nov 26 10:58:28 2007 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
/php-src/ext/pdo php_pdo_driver.h
/php-src/ext/spl spl_directory.h spl_iterators.h
/php-src/main/streams php_stream_filter_api.h
Log:
- Fixed bug #43365 (Several enums have trailing commas)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.225&r2=1.226&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.225 php-src/ext/pcre/php_pcre.c:1.226
--- php-src/ext/pcre/php_pcre.c:1.225 Sun Oct 7 12:21:05 2007
+++ php-src/ext/pcre/php_pcre.c Mon Nov 26 10:58:28 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.225 2007/10/07 12:21:05 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.226 2007/11/26 10:58:28 jani Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -53,7 +53,7 @@
PHP_PCRE_INTERNAL_ERROR,
PHP_PCRE_BACKTRACK_LIMIT_ERROR,
PHP_PCRE_RECURSION_LIMIT_ERROR,
- PHP_PCRE_BAD_UTF8_ERROR,
+ PHP_PCRE_BAD_UTF8_ERROR
};
typedef struct {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.88&r2=1.89&diff_format=u
Index: php-src/ext/pdo/php_pdo_driver.h
diff -u php-src/ext/pdo/php_pdo_driver.h:1.88
php-src/ext/pdo/php_pdo_driver.h:1.89
--- php-src/ext/pdo/php_pdo_driver.h:1.88 Thu Sep 27 18:28:40 2007
+++ php-src/ext/pdo/php_pdo_driver.h Mon Nov 26 10:58:28 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_driver.h,v 1.88 2007/09/27 18:28:40 dmitry Exp $ */
+/* $Id: php_pdo_driver.h,v 1.89 2007/11/26 10:58:28 jani Exp $ */
#ifndef PHP_PDO_DRIVER_H
#define PHP_PDO_DRIVER_H
@@ -68,7 +68,7 @@
PDO_PARAM_STMT, /* hierarchical result set */
/* get_col ptr should point to a zend_bool */
- PDO_PARAM_BOOL,
+ PDO_PARAM_BOOL
};
/* magic flag to denote a parameter as being input/output */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.35&r2=1.36&diff_format=u
Index: php-src/ext/spl/spl_directory.h
diff -u php-src/ext/spl/spl_directory.h:1.35
php-src/ext/spl/spl_directory.h:1.36
--- php-src/ext/spl/spl_directory.h:1.35 Wed Oct 3 10:31:03 2007
+++ php-src/ext/spl/spl_directory.h Mon Nov 26 10:58:28 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.h,v 1.35 2007/10/03 10:31:03 dsp Exp $ */
+/* $Id: spl_directory.h,v 1.36 2007/11/26 10:58:28 jani Exp $ */
#ifndef SPL_DIRECTORY_H
#define SPL_DIRECTORY_H
@@ -35,7 +35,7 @@
typedef enum {
SPL_FS_INFO, /* must be 0 */
SPL_FS_DIR,
- SPL_FS_FILE,
+ SPL_FS_FILE
} SPL_FS_OBJ_TYPE;
typedef struct _spl_filesystem_object spl_filesystem_object;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.h?r1=1.42&r2=1.43&diff_format=u
Index: php-src/ext/spl/spl_iterators.h
diff -u php-src/ext/spl/spl_iterators.h:1.42
php-src/ext/spl/spl_iterators.h:1.43
--- php-src/ext/spl/spl_iterators.h:1.42 Fri May 11 00:14:36 2007
+++ php-src/ext/spl/spl_iterators.h Mon Nov 26 10:58:28 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.h,v 1.42 2007/05/11 00:14:36 helly Exp $ */
+/* $Id: spl_iterators.h,v 1.43 2007/11/26 10:58:28 jani Exp $ */
#ifndef SPL_ITERATORS_H
#define SPL_ITERATORS_H
@@ -94,7 +94,7 @@
enum {
/* public */
REGIT_USE_KEY = 0x00000001,
- REGIT_INVERTED = 0x00000002,
+ REGIT_INVERTED = 0x00000002
};
typedef enum {
@@ -103,7 +103,7 @@
REGIT_MODE_ALL_MATCHES,
REGIT_MODE_SPLIT,
REGIT_MODE_REPLACE,
- REGIT_MODE_MAX,
+ REGIT_MODE_MAX
} regex_mode;
typedef struct _spl_dual_it_object {
http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_filter_api.h?r1=1.21&r2=1.22&diff_format=u
Index: php-src/main/streams/php_stream_filter_api.h
diff -u php-src/main/streams/php_stream_filter_api.h:1.21
php-src/main/streams/php_stream_filter_api.h:1.22
--- php-src/main/streams/php_stream_filter_api.h:1.21 Sun Oct 7 05:15:07 2007
+++ php-src/main/streams/php_stream_filter_api.h Mon Nov 26 10:58:28 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_stream_filter_api.h,v 1.21 2007/10/07 05:15:07 davidw Exp $ */
+/* $Id: php_stream_filter_api.h,v 1.22 2007/11/26 10:58:28 jani Exp $ */
/* The filter API works on the principle of "Bucket-Brigades". This is
* partially inspired by the Apache 2 method of doing things, although
@@ -64,7 +64,7 @@
typedef enum {
PSFS_ERR_FATAL, /* error in data stream */
PSFS_FEED_ME, /* filter needs more data; stop processing chain until
more is available */
- PSFS_PASS_ON, /* filter generated output buckets; pass them on to
next in chain */
+ PSFS_PASS_ON /* filter generated output buckets; pass them on to
next in chain */
} php_stream_filter_status_t;
/* Buckets API. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
