[Tarantool-patches] [PATCH v3 06/20] sql: rename sql_reset() to sql_stmt_reset()

[Nikita Pettik]

---
 src/box/ck_constraint.c | 2 +-
 src/box/sql/sqlInt.h    | 2 +-
 src/box/sql/vdbe.c      | 2 +-
 src/box/sql/vdbeapi.c   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/box/ck_constraint.c b/src/box/ck_constraint.c
index 551bdd397..bc2a5e8f4 100644
--- a/src/box/ck_constraint.c
+++ b/src/box/ck_constraint.c
@@ -173,7 +173,7 @@ ck_constraint_program_run(struct ck_constraint *ck_constraint,
 	 * Get VDBE execution state and reset VM to run it
 	 * next time.
 	 */
-	return sql_reset(ck_constraint->stmt);
+	return sql_stmt_reset(ck_constraint->stmt);
 }
 
 int
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index cf0b946f1..b1e4ac2fa 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -532,7 +532,7 @@ sql_stmt_finalize(sql_stmt * pStmt);
  * @retval sql_ret_code Error code on error.
  */
 int
-sql_reset(struct sql_stmt *stmt);
+sql_stmt_reset(struct sql_stmt *stmt);
 
 int
 sql_exec(sql *,	/* An open database */
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index 336fd4a52..8da007b4d 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -1084,7 +1084,7 @@ case OP_Yield: {            /* in1, jump */
  * automatically.
  *
  * P1 is the result code returned by sql_exec(),
- * sql_reset(), or sql_stmt_finalize().  For a normal halt,
+ * sql_stmt_reset(), or sql_stmt_finalize().  For a normal halt,
  * this should be 0.
  * For errors, it can be some other value.  If P1!=0 then P2 will
  * determine whether or not to rollback the current transaction.
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 7463fb9d7..b6bf9aa81 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -88,7 +88,7 @@ sql_stmt_finalize(sql_stmt * pStmt)
 }
 
 int
-sql_reset(sql_stmt * pStmt)
+sql_stmt_reset(sql_stmt *pStmt)
 {
 	assert(pStmt != NULL);
 	struct Vdbe *v = (Vdbe *) pStmt;
@@ -414,7 +414,7 @@ sqlStep(Vdbe * p)
 
 	assert(p);
 	if (p->magic != VDBE_MAGIC_RUN)
-		sql_reset((sql_stmt *) p);
+		sql_stmt_reset((sql_stmt *) p);
 
 	/* Check that malloc() has not failed. If it has, return early. */
 	db = p->db;
-- 
2.15.1