PHP mysqlnd svn commit: r1417 - trunk/php5/ext/pdo_mysqlnd

[ahristov]

Author: ahristov
Date: 2008-04-10 17:44:51 +0200 (Thu, 10 Apr 2008)
New Revision: 1417

Modified:
   trunk/php5/ext/pdo_mysqlnd/mysql_statement.c
Log:
Add info to #endif , which one closes what


Modified: trunk/php5/ext/pdo_mysqlnd/mysql_statement.c
===================================================================
--- trunk/php5/ext/pdo_mysqlnd/mysql_statement.c	2008-04-10 15:17:00 UTC (rev 1416)
+++ trunk/php5/ext/pdo_mysqlnd/mysql_statement.c	2008-04-10 15:44:51 UTC (rev 1417)
@@ -79,7 +79,8 @@
 		efree(S->out_null);
 		efree(S->out_length);
 	}
-#endif
+#endif /* HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND */
+
 #if HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND
 	if (S->H->server) {
 		while (mysql_more_results(S->H->server)) {
@@ -94,7 +95,7 @@
 			}
 		}
 	}
-#endif
+#endif /* HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND */
 
 	efree(S);
 	return 1;
@@ -109,7 +110,7 @@
 #if HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND
 	if (S->stmt) {
 		/* (re)bind the parameters */
-		if (mysqlnd_stmt_bind_param(S->stmt, S->params)) {
+		if (mysql_stmt_bind_param(S->stmt, S->params)) {
 			pdo_mysql_error_stmt(stmt);
 			return 0;
 		}
@@ -131,7 +132,7 @@
 			}
 			mysqlnd_stmt_bind_result(S->stmt, S->result_bind);
 		}
-#endif
+#endif /* PDO_USE_MYSQLND */
 
 #	if PDO_USE_MYSQLND
 		S->result = mysqlnd_stmt_result_metadata(S->stmt);
@@ -207,7 +208,7 @@
 							S->bound_result[i].buffer_length,
 							S->fields[i].type
 							);
-#endif
+#endif /* 0 */
 
 					/* there are cases where the length reported by mysql is too short.
 					 * eg: when describing a table that contains an enum column. Since
@@ -236,14 +237,14 @@
 				}
 			}
 		}
-#	endif
+#	endif /* if PDO_USE_MYSQLND */
 		row_count = mysql_stmt_affected_rows(S->stmt);
 		if (row_count != (my_ulonglong)-1) {
 			stmt->row_count = row_count;
 		}
 		return 1;
 	}
-#endif
+#endif /* HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND */
 	/* ensure that we free any previous unfetched results */
 	if (S->result) {
 		mysql_free_result(S->result);
@@ -335,7 +336,7 @@
 #else
 	strcpy(stmt->error_code, "HYC00");
 	return 0;
-#endif
+#endif /* HAVE_MYSQL_STMT_PREPARE */
 }
 /* }}} */
 
@@ -393,7 +394,7 @@
 					*b->length = 0; 
 					return 1; 
 				} 
-#endif
+#endif /* PDO_USE_MYSQLND */
 	
 				switch (PDO_PARAM_TYPE(param->param_type)) {
 					case PDO_PARAM_STMT:
@@ -429,7 +430,7 @@
 							b->type = MYSQL_TYPE_LONGLONG;
 #elif SIZEOF_LONG==4
 							b->type = MYSQL_TYPE_LONG;
-#endif
+#endif /* SIZEOF_LONG */
 						break;
 					case IS_DOUBLE:
 						b->type = MYSQL_TYPE_DOUBLE;	
@@ -462,13 +463,13 @@
 					default:
 						return 0;
 				}
-#endif
+#endif /* PDO_USE_MYSQLND */
 		case PDO_PARAM_EVT_FREE:
 #if PDO_USE_MYSQLND
 			if (S->params) {
 /* TODO:				efree(S->params);*/
 			}
-#endif
+#endif /* PDO_USE_MYSQLND */
 			return 1;
 
 		case PDO_PARAM_EVT_EXEC_POST:
@@ -479,7 +480,7 @@
 			break;
 		}
 	}
-#endif
+#endif /* HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND */
 	return 1;
 }
 /* }}} */
@@ -524,8 +525,8 @@
 
 		return 1;
 	}
-#	endif
-#endif
+#	endif /* HAVE_MYSQL_STMT_PREPARE */
+#endif /* PDO_USE_MYSQLND */
 	/* S->stmt == NULL */
 
 	if (!S->result) {
@@ -651,7 +652,7 @@
 		*len = S->out_length[colno];
 		return 1;
 	}
-#endif
+#endif /* PDO_USE_MYSQLND else HAVE_MYSQL_STMT_PREPARE */
 	*ptr = S->current_data[colno];
 	*len = S->current_lengths[colno];
 	return 1;
@@ -700,6 +701,7 @@
         default:
             return NULL;
     }
+#undef PDO_MYSQL_NATIVE_TYPE_NAME
 } /* }}} */
 
 static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, long colno, zval *return_value
TSRMLS_DC) /* {{{ */