<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2018-02-28 18:25:10 +0900 (Wed, 28 Feb 2018)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5">179c0e5e2b20aab036c12fb949aa29b169d612f5</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">config: add key to error message on delete failure</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04">lib/config.c</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: lib/config.c (+6 -2)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L154">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L155">155</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L156">156</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L157">157</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L158">158</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L159">159</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L160">160</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L161">161</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L162">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L163">163</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L164">164</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L165">165</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L166">166</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L167">167</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L168">168</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04L169">169</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R154">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R155">155</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R156">156</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R157">157</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R158">158</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R159">159</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R160">160</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R161">161</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R162">162</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R163">163</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R164">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R165">165</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R166">166</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R167">167</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R168">168</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R169">169</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R170">170</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R171">171</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R172">172</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/179c0e5e2b20aab036c12fb949aa29b169d612f5#diff-6a8ba4874902854c0fea0652587edb04R173">173</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -155,7 +155,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_config_delete(grn_ctx *ctx,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> rc = grn_io_lock(ctx, config->io, grn_lock_timeout);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (rc != GRN_SUCCESS) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (ctx->rc == GRN_SUCCESS) {</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- ERR(rc, "[config][delete] failed to lock");</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ ERR(rc,</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ "[config][delete] failed to lock: <%.*s>",</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ key_size, key);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_API_RETURN(rc);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -163,7 +165,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_config_delete(grn_ctx *ctx,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_io_unlock(config->io);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (rc != GRN_SUCCESS) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (ctx->rc == GRN_SUCCESS) {</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- ERR(rc, "[config][delete] failed to delete");</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ ERR(rc,</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ "[config][delete] failed to delete: <%.*s>",</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ key_size, key);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>