<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12206">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add whitespace around PRId64 constants<br><br>Avoid string concatenations without interleaving whitespace.<br>Some compilers don't like "foo""bar", they only like "foo" "bar".<br><br>Requested by: Pau<br>https://gerrit.osmocom.org/c/osmo-hlr/+/12121/5/src/db_hlr.c#637<br><br>Change-Id: Ic7a81114f9afbefcbd62d434720854cfdd4a2dd9<br>---<br>M src/ctrl.c<br>M src/db_auc.c<br>M src/db_hlr.c<br>M src/hlr_db_tool.c<br>4 files changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ctrl.c b/src/ctrl.c</span><br><span>index 8ae9d7c..05a0107 100644</span><br><span>--- a/src/ctrl.c</span><br><span>+++ b/src/ctrl.c</span><br><span>@@ -132,7 +132,7 @@</span><br><span> struct hlr_subscriber *subscr)</span><br><span> {</span><br><span> ctrl_cmd_reply_printf(cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "\nid\t%"PRIu64</span><br><span style="color: hsl(120, 100%, 40%);">+ "\nid\t%" PRIu64</span><br><span> FMT_S</span><br><span> FMT_S</span><br><span> FMT_BOOL</span><br><span>@@ -189,7 +189,7 @@</span><br><span> ctrl_cmd_reply_printf(cmd,</span><br><span> "\naud3g.%s\t%s"</span><br><span> "\naud3g.ind_bitlen\t%u"</span><br><span style="color: hsl(0, 100%, 40%);">- "\naud3g.sqn\t%"PRIu64</span><br><span style="color: hsl(120, 100%, 40%);">+ "\naud3g.sqn\t%" PRIu64</span><br><span> ,</span><br><span> aud->u.umts.opc_is_op? "op" : "opc",</span><br><span> hexdump_buf(aud->u.umts.opc),</span><br><span>diff --git a/src/db_auc.c b/src/db_auc.c</span><br><span>index 5fb5e3a..e29b44b 100644</span><br><span>--- a/src/db_auc.c</span><br><span>+++ b/src/db_auc.c</span><br><span>@@ -49,7 +49,7 @@</span><br><span> /* execute the statement */</span><br><span> rc = sqlite3_step(stmt);</span><br><span> if (rc != SQLITE_DONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64</span><br><span> ": SQL error: (%d) %s\n",</span><br><span> subscr_id, rc, sqlite3_errmsg(dbc->db));</span><br><span> ret = -EIO;</span><br><span>@@ -59,11 +59,11 @@</span><br><span> /* verify execution result */</span><br><span> rc = sqlite3_changes(dbc->db);</span><br><span> if (!rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64</span><br><span> ": no auc_3g entry for such subscriber\n", subscr_id);</span><br><span> ret = -ENOENT;</span><br><span> } else if (rc != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%" PRId64</span><br><span> ": SQL modified %d rows (expected 1)\n", subscr_id, rc);</span><br><span> ret = -EIO;</span><br><span> }</span><br><span>diff --git a/src/db_hlr.c b/src/db_hlr.c</span><br><span>index 342698e..db31009 100644</span><br><span>--- a/src/db_hlr.c</span><br><span>+++ b/src/db_hlr.c</span><br><span>@@ -93,7 +93,7 @@</span><br><span> rc = sqlite3_step(stmt);</span><br><span> if (rc != SQLITE_DONE) {</span><br><span> LOGP(DAUC, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Cannot delete subscriber ID=%"PRId64": SQL error: (%d) %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cannot delete subscriber ID=%" PRId64 ": SQL error: (%d) %s\n",</span><br><span> subscr_id, rc, sqlite3_errmsg(dbc->db));</span><br><span> db_remove_reset(stmt);</span><br><span> return -EIO;</span><br><span>@@ -102,11 +102,11 @@</span><br><span> /* verify execution result */</span><br><span> rc = sqlite3_changes(dbc->db);</span><br><span> if (!rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%"PRId64"\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%" PRId64 "\n",</span><br><span> subscr_id);</span><br><span> ret = -ENOENT;</span><br><span> } else if (rc != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64</span><br><span> ": SQL modified %d rows (expected 1)\n", subscr_id, rc);</span><br><span> ret = -EIO;</span><br><span> }</span><br><span>@@ -316,7 +316,7 @@</span><br><span> * empty, and no entry is not an error then.*/</span><br><span> ret = -ENOENT;</span><br><span> else if (rc != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64</span><br><span> " from %s: SQL modified %d rows (expected 1)\n",</span><br><span> subscr_id, label, rc);</span><br><span> ret = -EIO;</span><br><span>@@ -504,7 +504,7 @@</span><br><span> </span><br><span> rc = db_sel(dbc, stmt, subscr, &err);</span><br><span> if (rc)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%"PRId64": %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%" PRId64 ": %s\n",</span><br><span> id, err);</span><br><span> return rc;</span><br><span> }</span><br><span>@@ -592,7 +592,7 @@</span><br><span> /* execute the statement */</span><br><span> rc = sqlite3_step(stmt);</span><br><span> if (rc != SQLITE_DONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64": SQL Error: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64 ": SQL Error: %s\n",</span><br><span> is_ps? "SGSN" : "VLR", subscr_id, sqlite3_errmsg(dbc->db));</span><br><span> ret = -EIO;</span><br><span> goto out;</span><br><span>@@ -601,13 +601,13 @@</span><br><span> /* verify execution result */</span><br><span> rc = sqlite3_changes(dbc->db);</span><br><span> if (!rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%" PRId64</span><br><span> ": no such subscriber\n",</span><br><span> is_ps? "SGSN" : "VLR", subscr_id);</span><br><span> ret = -ENOENT;</span><br><span> goto out;</span><br><span> } else if (rc != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64</span><br><span> ": SQL modified %d rows (expected 1)\n",</span><br><span> is_ps? "SGSN" : "VLR", subscr_id, rc);</span><br><span> ret = -EIO;</span><br><span>@@ -635,7 +635,7 @@</span><br><span> rc = sqlite3_step(stmt);</span><br><span> if (rc != SQLITE_DONE) {</span><br><span> LOGP(DAUC, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Cannot update LU timestamp for subscriber ID=%"PRId64": SQL error: (%d) %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cannot update LU timestamp for subscriber ID=%" PRId64 ": SQL error: (%d) %s\n",</span><br><span> subscr_id, rc, sqlite3_errmsg(dbc->db));</span><br><span> ret = -EIO;</span><br><span> goto out;</span><br><span>@@ -644,12 +644,12 @@</span><br><span> /* verify execution result */</span><br><span> rc = sqlite3_changes(dbc->db);</span><br><span> if (!rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%" PRId64</span><br><span> ": no such subscriber\n", subscr_id);</span><br><span> ret = -ENOENT;</span><br><span> goto out;</span><br><span> } else if (rc != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%"PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%" PRId64</span><br><span> ": SQL modified %d rows (expected 1)\n", subscr_id, rc);</span><br><span> ret = -EIO;</span><br><span> }</span><br><span>diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c</span><br><span>index 1a9c60c..516b91e 100644</span><br><span>--- a/src/hlr_db_tool.c</span><br><span>+++ b/src/hlr_db_tool.c</span><br><span>@@ -300,7 +300,7 @@</span><br><span> </span><br><span> imsi = sqlite3_column_int64(stmt, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(imsi_str, sizeof(imsi_str), "%"PRId64, imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(imsi_str, sizeof(imsi_str), "%" PRId64, imsi);</span><br><span> </span><br><span> rc = db_subscr_create(dbc, imsi_str);</span><br><span> if (rc < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12206">change 12206</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/12206"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic7a81114f9afbefcbd62d434720854cfdd4a2dd9 </div>
<div style="display:none"> Gerrit-Change-Number: 12206 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>