diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-03-31 16:14:13 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-03-31 16:14:13 +0200 |
| commit | b70dfa610d89786aa72a4adb4ffc1ba27a5f8af4 (patch) | |
| tree | 46b8ad0e9463c83b3a36344dc0ae050adc6ed358 /openbsc/src/utils/meas_db.c | |
| parent | 4b940126a3132ac6d6da4194229f2b8cb642c2ec (diff) | |
| parent | cf1302e4cb4875816615a23e5d7e2e9f7bcb5bca (diff) | |
Merge branch 'master' into sysmocom/iu
Conflicts:
openbsc/src/libmsc/auth.c
openbsc/src/libmsc/gsm_04_08.c
openbsc/src/osmo-bsc/osmo_bsc_vty.c
openbsc/tests/Makefile.am
Diffstat (limited to 'openbsc/src/utils/meas_db.c')
| -rw-r--r-- | openbsc/src/utils/meas_db.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/openbsc/src/utils/meas_db.c b/openbsc/src/utils/meas_db.c index 6c7e7ae6e..a3b694e6b 100644 --- a/openbsc/src/utils/meas_db.c +++ b/openbsc/src/utils/meas_db.c @@ -314,7 +314,6 @@ err_io: void meas_db_close(struct meas_db_state *st) { - int retries; if (sqlite3_finalize(st->stmt_ins_mr) != SQLITE_OK) fprintf(stderr, "DB insert measurement report finalize error: %s\n", sqlite3_errmsg(st->db)); @@ -324,16 +323,8 @@ void meas_db_close(struct meas_db_state *st) if (sqlite3_finalize(st->stmt_upd_mr) != SQLITE_OK) fprintf(stderr, "DB update measurement report finalize error: %s\n", sqlite3_errmsg(st->db)); - retries = 0; - while (1) { - if (sqlite3_close(st->db) == SQLITE_OK) - break; - if ((++retries) >= 3) { - fprintf(stderr, "Unable to close DB, abandoning.\n"); - break; - } - sleep(1); - } + if (sqlite3_close(st->db) != SQLITE_OK) + fprintf(stderr, "Unable to close DB, abandoning.\n"); talloc_free(st); |