abies Mon Feb 2 09:57:21 2004 EDT
Modified files:
/php-src/ext/interbase ibase_service.c interbase.c
Log:
Use correct flag for repair options
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_service.c?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.4
php-src/ext/interbase/ibase_service.c:1.5
--- php-src/ext/interbase/ibase_service.c:1.4 Mon Feb 2 09:01:41 2004
+++ php-src/ext/interbase/ibase_service.c Mon Feb 2 09:57:20 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ibase_service.c,v 1.4 2004/02/02 14:01:41 abies Exp $ */
+/* $Id: ibase_service.c,v 1.5 2004/02/02 14:57:20 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -497,9 +497,6 @@
case isc_spb_sts_sys_relations:
goto options_argument;
}
- } else if (svc_action == isc_action_svc_display_user) {
- *buf = svc_action;
- spb_len = 1;
} else {
/* these actions all expect different types of arguments */
switch (action) {
@@ -508,15 +505,16 @@
_php_ibase_module_error("Unrecognised option (%ld)"
TSRMLS_CC, action);
RETURN_FALSE;
- case isc_spb_prp_activate:
- case isc_spb_prp_db_online:
case isc_spb_rpr_check_db:
case isc_spb_rpr_ignore_checksum:
case isc_spb_rpr_kill_shadows:
case isc_spb_rpr_mend_db:
case isc_spb_rpr_validate_db:
- case isc_spb_rpr_full:
case isc_spb_rpr_sweep_db:
+ svc_action = isc_action_svc_repair;
+
+ case isc_spb_prp_activate:
+ case isc_spb_prp_db_online:
options_argument:
argument |= action;
action = isc_spb_options;
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.197&r2=1.198&ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.197 php-src/ext/interbase/interbase.c:1.198
--- php-src/ext/interbase/interbase.c:1.197 Mon Feb 2 08:49:48 2004
+++ php-src/ext/interbase/interbase.c Mon Feb 2 09:57:20 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.197 2004/02/02 13:49:48 abies Exp $ */
+/* $Id: interbase.c,v 1.198 2004/02/02 14:57:20 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -26,7 +26,7 @@
#include "php.h"
-#define FILE_REVISION "$Revision: 1.197 $"
+#define FILE_REVISION "$Revision: 1.198 $"
#if HAVE_IBASE
@@ -624,12 +624,13 @@
REGISTER_LONG_CONSTANT("IBASE_PRP_SET_SQL_DIALECT",
isc_spb_prp_set_sql_dialect, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_PRP_ACTIVATE", isc_spb_prp_activate,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_PRP_DB_ONLINE", isc_spb_prp_db_online,
CONST_PERSISTENT);
+ /* repair options */
REGISTER_LONG_CONSTANT("IBASE_RPR_CHECK_DB", isc_spb_rpr_check_db,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_RPR_IGNORE_CHECKSUM",
isc_spb_rpr_ignore_checksum, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_RPR_KILL_SHADOWS", isc_spb_rpr_kill_shadows,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_RPR_MEND_DB", isc_spb_rpr_mend_db,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_RPR_VALIDATE_DB", isc_spb_rpr_validate_db,
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IBASE_RPR_FULL", isc_spb_rpr_full, CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IBASE_RPR_FULL", isc_spb_rpr_full, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_RPR_SWEEP_DB", isc_spb_rpr_sweep_db,
CONST_PERSISTENT);
/* db info arguments */
REGISTER_LONG_CONSTANT("IBASE_STS_DATA_PAGES", isc_spb_sts_data_pages,
CONST_PERSISTENT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
