Update of /cvsroot/monetdb/clients/src/php/Cimpl
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29897/clients/src/php/Cimpl
Modified Files:
Tag: Clients_1-20
php_monetdb.c
Log Message:
undoing my yesterday's changes
"
mark knownly unused parameters in the code
instead of squashing the compiler error
"
while working fine for php-swig, perl-swig on some platforms
seems to generate code (beyond our control) that requires
-Wno-unused-parameter
Index: php_monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/clients/src/php/Cimpl/php_monetdb.c,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- php_monetdb.c 6 Nov 2007 14:22:13 -0000 1.6.2.3
+++ php_monetdb.c 7 Nov 2007 07:55:34 -0000 1.6.2.4
@@ -377,9 +377,6 @@
*/
PHP_MINIT_FUNCTION(monetdb)
{
- /* unused parameters */
- (void) type;
-
ZEND_INIT_MODULE_GLOBALS(monetdb, php_monetdb_init_globals, NULL);
REGISTER_INI_ENTRIES();
@@ -431,9 +428,6 @@
*/
PHP_MSHUTDOWN_FUNCTION(monetdb)
{
- /* unused parameters */
- (void) type;
-
UNREGISTER_INI_ENTRIES();
zend_hash_destroy(&MG(notices));
zend_hash_destroy(&MG(errors));
@@ -446,10 +440,6 @@
*/
PHP_RINIT_FUNCTION(monetdb)
{
- /* unused parameters */
- (void) type;
- (void) module_number;
-
MG(default_link)=-1;
MG(num_links) = MG(num_persistent);
return SUCCESS;
@@ -460,10 +450,6 @@
*/
PHP_RSHUTDOWN_FUNCTION(monetdb)
{
- /* unused parameters */
- (void) type;
- (void) module_number;
-
/* clean up notice messages */
zend_hash_clean(&MG(notices));
zend_hash_clean(&MG(errors));
@@ -518,11 +504,6 @@
Mconn *monetdb;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
argc = ZEND_NUM_ARGS();
if (argc > 7 ||
zend_get_parameters_array_ex(argc, args) != SUCCESS)
@@ -725,11 +706,6 @@
int id;
Mconn *monetdb;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
switch (ZEND_NUM_ARGS()) {
case 0:
id = MG(default_link);
@@ -778,11 +754,6 @@
int id = -1;
Mconn *monetdb;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
switch(ZEND_NUM_ARGS()) {
case 0:
id = MG(default_link);
@@ -881,11 +852,6 @@
int id;
Mconn *monetdb;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "r", &monetdb_link) == SUCCESS) {
id = -1;
} else {
@@ -921,11 +887,6 @@
Mresult *monetdb_result;
php_monetdb_result_handle *monetdb_result_h;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &query)==FAILURE) {
@@ -1344,11 +1305,6 @@
Mresult *monetdb_result;
php_monetdb_result_handle *monetdb_result_h;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1,
&result)==FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1407,11 +1363,6 @@
int id = -1;
php_monetdb_notice **notice;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
&monetdb_link) ==
FAILURE) {
return;
@@ -1438,11 +1389,6 @@
Mresult *monetdb_result;
php_monetdb_result_handle *monetdb_result_h;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &result,
&field)==FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1515,11 +1461,6 @@
php_monetdb_result_handle *monetdb_result_h;
int i;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &result,
&field)==FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1552,11 +1493,6 @@
int field_offset, monetdb_row;
char *data;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if ((ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &result, &row,
&field)==FAILURE) &&
(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &result,
&field)==FAILURE)) {
WRONG_PARAM_COUNT;
@@ -1643,11 +1579,6 @@
zval *ctor_params = NULL;
zend_class_entry *ce = NULL;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (into_object) {
char *class_name;
int class_name_len;
@@ -1878,11 +1809,6 @@
long row;
php_monetdb_result_handle *monetdb_result_h;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result,
&row) == FAILURE) {
return;
}
@@ -1911,11 +1837,6 @@
php_monetdb_result_handle *monetdb_result_h;
int field_offset, monetdb_row;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if ((ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &result, &row,
&field)==FAILURE) &&
(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &result,
&field)==FAILURE)) {
WRONG_PARAM_COUNT;
@@ -2014,11 +1935,6 @@
zval **result;
php_monetdb_result_handle *monetdb_result_h;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1,
&result)==FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -2039,12 +1955,6 @@
char *from = NULL, *to = NULL, *ret = NULL;
int to_len;
int from_len;
-
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&from, &from_len) ==
FAILURE) {
return;
@@ -2066,11 +1976,6 @@
int id = -1;
Mconn *monetdb_conn;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "r",
&monetdb_link)
== FAILURE) {
RETURN_FALSE;
@@ -2090,11 +1995,6 @@
int id = -1;
Mconn *monetdb_conn;
- /* unused parameters */
- (void) return_value_ptr;
- (void) this_ptr;
- (void) return_value_used;
-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "r",
&monetdb_link)
== FAILURE) {
RETURN_FALSE;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
