jani Mon Nov 26 10:59:18 2007 UTC
Modified files: (Branch: PHP_5_2)
/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:
MFH:- Fixed bug #43365 (Several enums have trailing commas)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21&r2=1.168.2.9.2.22&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.22
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21 Thu Sep 20 08:10:44 2007
+++ php-src/ext/pcre/php_pcre.c Mon Nov 26 10:59:17 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21 2007/09/20 08:10:44 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.22 2007/11/26 10:59:17 jani Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -48,7 +48,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
};
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.66.2.11.2.6&r2=1.66.2.11.2.7&diff_format=u
Index: php-src/ext/pdo/php_pdo_driver.h
diff -u php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6
php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.7
--- php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6 Mon Jul 23 11:53:58 2007
+++ php-src/ext/pdo/php_pdo_driver.h Mon Nov 26 10:59:17 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_driver.h,v 1.66.2.11.2.6 2007/07/23 11:53:58 jani Exp $ */
+/* $Id: php_pdo_driver.h,v 1.66.2.11.2.7 2007/11/26 10:59:17 jani Exp $ */
#ifndef PHP_PDO_DRIVER_H
#define PHP_PDO_DRIVER_H
@@ -67,7 +67,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.12.2.5.2.4&r2=1.12.2.5.2.5&diff_format=u
Index: php-src/ext/spl/spl_directory.h
diff -u php-src/ext/spl/spl_directory.h:1.12.2.5.2.4
php-src/ext/spl/spl_directory.h:1.12.2.5.2.5
--- php-src/ext/spl/spl_directory.h:1.12.2.5.2.4 Mon Jan 1 09:36:07 2007
+++ php-src/ext/spl/spl_directory.h Mon Nov 26 10:59:18 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.h,v 1.12.2.5.2.4 2007/01/01 09:36:07 sebastian Exp $ */
+/* $Id: spl_directory.h,v 1.12.2.5.2.5 2007/11/26 10:59:18 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.18.2.7.2.12&r2=1.18.2.7.2.13&diff_format=u
Index: php-src/ext/spl/spl_iterators.h
diff -u php-src/ext/spl/spl_iterators.h:1.18.2.7.2.12
php-src/ext/spl/spl_iterators.h:1.18.2.7.2.13
--- php-src/ext/spl/spl_iterators.h:1.18.2.7.2.12 Fri May 11 00:15:25 2007
+++ php-src/ext/spl/spl_iterators.h Mon Nov 26 10:59:18 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.h,v 1.18.2.7.2.12 2007/05/11 00:15:25 helly Exp $ */
+/* $Id: spl_iterators.h,v 1.18.2.7.2.13 2007/11/26 10:59:18 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.13.2.1.2.1&r2=1.13.2.1.2.2&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.13.2.1.2.1
php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.2
--- php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.1 Mon Jan 1
09:36:12 2007
+++ php-src/main/streams/php_stream_filter_api.h Mon Nov 26 10:59:18 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_stream_filter_api.h,v 1.13.2.1.2.1 2007/01/01 09:36:12 sebastian
Exp $ */
+/* $Id: php_stream_filter_api.h,v 1.13.2.1.2.2 2007/11/26 10:59:18 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
@@ -62,7 +62,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
