<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10241">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/db.c: don't ignore the result of db_bootstrap()<br><br>Change-Id: I0de3d4c4355c4dee8b832faae347586d1e1b3516<br>---<br>M src/db.c<br>1 file changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/41/10241/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/db.c b/src/db.c</span><br><span>index 2d1bdde..4b0577f 100644</span><br><span>--- a/src/db.c</span><br><span>+++ b/src/db.c</span><br><span>@@ -202,7 +202,7 @@</span><br><span>           if (rc != SQLITE_OK) {</span><br><span>                       LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n",</span><br><span>                         stmt_bootstrap_sql[i]);</span><br><span style="color: hsl(0, 100%, 40%);">-                    return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+                    return rc;</span><br><span>           }</span><br><span> </span><br><span>                /* execute the statement */</span><br><span>@@ -214,10 +214,10 @@</span><br><span>                       " during stmt '%s'",</span><br><span>                       rc, sqlite3_errmsg(dbc->db),</span><br><span>                              stmt_bootstrap_sql[i]);</span><br><span style="color: hsl(0, 100%, 40%);">-                    return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+                    return rc;</span><br><span>           }</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return SQLITE_OK;</span><br><span> }</span><br><span> </span><br><span> struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logging)</span><br><span>@@ -274,7 +274,12 @@</span><br><span>            LOGP(DDB, LOGL_ERROR, "Unable to set Write-Ahead Logging: %s\n",</span><br><span>                   err_msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   db_bootstrap(dbc);</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = db_bootstrap(dbc);</span><br><span style="color: hsl(120, 100%, 40%);">+       if (rc != SQLITE_OK) {</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGP(DDB, LOGL_ERROR, "Failed to bootstrap DB: (rc=%d) %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                       rc, sqlite3_errmsg(dbc->db));</span><br><span style="color: hsl(120, 100%, 40%);">+              goto out_free;</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span> </span><br><span>        /* prepare all SQL statements */</span><br><span>     for (i = 0; i < ARRAY_SIZE(dbc->stmt); i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10241">change 10241</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10241"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0de3d4c4355c4dee8b832faae347586d1e1b3516 </div>
<div style="display:none"> Gerrit-Change-Number: 10241 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>