[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] cvs: pecl /pdo pdo_stmt.c
From:       "Wez Furlong" <wez () php ! net>
Date:       2004-12-27 22:04:55
Message-ID: cvswez1104185095 () cvsserver
[Download RAW message or body]

wez		Mon Dec 27 17:04:55 2004 EDT

  Modified files:              
    /pecl/pdo	pdo_stmt.c 
  Log:
  more get_method signature changes
  
  
http://cvs.php.net/diff.php/pecl/pdo/pdo_stmt.c?r1=1.50&r2=1.51&ty=u
Index: pecl/pdo/pdo_stmt.c
diff -u pecl/pdo/pdo_stmt.c:1.50 pecl/pdo/pdo_stmt.c:1.51
--- pecl/pdo/pdo_stmt.c:1.50	Thu Oct 28 03:47:46 2004
+++ pecl/pdo/pdo_stmt.c	Mon Dec 27 17:04:54 2004
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.50 2004/10/28 07:47:46 helly Exp $ */
+/* $Id: pdo_stmt.c,v 1.51 2004/12/27 22:04:54 wez Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -241,9 +241,13 @@
 			}
 		}
 
+#if 0
+		/* if you prepare and then execute passing an array of params keyed by names,
+		 * then this will trigger, and we don't want that */
 		if (param->paramno == -1) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Did not found column name '%s' in \
the defined columns; it will not be bound", param->name);  }
+#endif
 	}
 
 	if (param->name) {
@@ -1012,10 +1016,19 @@
 	return NULL;
 }
 
-static union _zend_function *dbstmt_method_get(zval *object, char *method_name, int \
method_len TSRMLS_DC) +static union _zend_function *dbstmt_method_get(
+#if PHP_API_VERSION >= 20041225
+	zval **object_pp,
+#else
+	zval *object,
+#endif
+   	char *method_name, int method_len TSRMLS_DC)
 {
 	zend_function *fbc;
 	char *lc_method_name;
+#if PHP_API_VERSION >= 20041225
+	zval *object = *object_pp;
+#endif
 
 	lc_method_name = emalloc(method_len + 1);
 	zend_str_tolower_copy(lc_method_name, method_name, method_len);
@@ -1351,10 +1364,19 @@
 	return ht;
 }
 
-static union _zend_function *row_method_get(zval *object, char *method_name, int \
method_len TSRMLS_DC) +static union _zend_function *row_method_get(
+#if PHP_API_VERSION >= 20041225
+	zval **object_pp,
+#else
+	zval *object,
+#endif
+	char *method_name, int method_len TSRMLS_DC)
 {
 	zend_function *fbc;
 	char *lc_method_name;
+#if PHP_API_VERSION >= 20041225
+	zval *object = *object_pp;
+#endif
 
 	lc_method_name = emalloc(method_len + 1);
 	zend_str_tolower_copy(lc_method_name, method_name, method_len);

-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]