[MERGED] osmo-hlr[master]: code undup: use db_remove_reset() in db_auc.c

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: code undup: use db_remove_reset() in db_auc.c
......................................................................


code undup: use db_remove_reset() in db_auc.c

Change-Id: I32d728e2b8a9771421c097647aa0e060e29a601f
---
M src/db_auc.c
1 file changed, 2 insertions(+), 20 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/db_auc.c b/src/db_auc.c
index 10c1816..d469920 100644
--- a/src/db_auc.c
+++ b/src/db_auc.c
@@ -60,16 +60,7 @@
 		return -2;
 	}
 
-	/* remove bindings and reset statement to be re-executed */
-	rc = sqlite3_clear_bindings(stmt);
-	if (rc != SQLITE_OK) {
-		LOGP(DAUC, LOGL_ERROR, "Error clerearing bindings: %d\n", rc);
-	}
-	rc = sqlite3_reset(stmt);
-	if (rc != SQLITE_OK) {
-		LOGP(DAUC, LOGL_ERROR, "Error in sqlite3_reset: %d\n", rc);
-	}
-
+	db_remove_reset(stmt);
 	return 0;
 }
 
@@ -172,16 +163,7 @@
 		ret = -ENOENT;
 
 out:
-	/* remove bindings and reset statement to be re-executed */
-	rc = sqlite3_clear_bindings(stmt);
-	if (rc != SQLITE_OK) {
-		LOGAUC(imsi, LOGL_ERROR, "Error in sqlite3_clear_bindings(): %d\n", rc);
-	}
-	rc = sqlite3_reset(stmt);
-	if (rc != SQLITE_OK) {
-		LOGAUC(imsi, LOGL_ERROR, "Error in sqlite3_reset(): %d\n", rc);
-	}
-
+	db_remove_reset(stmt);
 	return ret;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/4187
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I32d728e2b8a9771421c097647aa0e060e29a601f
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>