<!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">2015-01-21 15:56:16 +0900 (Wed, 21 Jan 2015)</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/50feaec90389164dbe01ec29adb8780113372d10">50feaec90389164dbe01ec29adb8780113372d10</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">Fix a bug that wrong flag name is parsed
For example, `--query_flags ALLOW_PRAGMAxALLOW_COLUMN` can be parsed as
`ALLOW_PRAGMA|ALLOW_COLUMN`. `x` is just skipped.</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/50feaec90389164dbe01ec29adb8780113372d10#diff-0">lib/proc.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/proc.c (+4 -4)</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/50feaec90389164dbe01ec29adb8780113372d10#L0L395">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L396">396</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L397">397</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L398">398</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L399">399</a></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/50feaec90389164dbe01ec29adb8780113372d10#L0L400">400</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L401">401</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L402">402</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L606">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L607">607</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L608">608</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L609">609</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L610">610</a></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/50feaec90389164dbe01ec29adb8780113372d10#L0L611">611</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L612">612</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L613">613</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3539">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3540">3540</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3541">3541</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3542">3542</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3543">3543</a></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/50feaec90389164dbe01ec29adb8780113372d10#L0L3544">3544</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3545">3545</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3546">3546</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3752">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3753">3753</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3754">3754</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3755">3755</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3756">3756</a></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/50feaec90389164dbe01ec29adb8780113372d10#L0L3757">3757</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3758">3758</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0L3759">3759</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/50feaec90389164dbe01ec29adb8780113372d10#L0R395">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R396">396</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R397">397</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R398">398</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R399">399</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R400">400</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R401">401</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R402">402</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R606">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R607">607</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R608">608</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R609">609</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R610">610</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R611">611</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R612">612</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R613">613</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3539">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3540">3540</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3541">3541</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3542">3542</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3543">3543</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3544">3544</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3545">3545</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3546">3546</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3752">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3753">3753</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3754">3754</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3755">3755</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3756">3756</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3757">3757</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3758">3758</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/50feaec90389164dbe01ec29adb8780113372d10#L0R3759">3759</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">@@ -396,7 +396,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_parse_query_flags(grn_ctx *ctx, const char *query_flags,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (((query_flags_end - query_flags) >= (sizeof(#name) - 1)) &&\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> (!memcmp(query_flags, #name, sizeof(#name) - 1))) {\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> flags |= GRN_EXPR_ ## name;\</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- query_flags += sizeof(#name);\</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ query_flags += sizeof(#name) - 1;\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> continue;\</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-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -607,7 +607,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_parse_table_group_calc_types(grn_ctx *ctx,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (((calc_types_end - calc_types) >= (sizeof(#name) - 1)) &&\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> (!memcmp(calc_types, #name, sizeof(#name) - 1))) {\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> flags |= GRN_TABLE_GROUP_CALC_ ## name;\</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- calc_types += sizeof(#name);\</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ calc_types += sizeof(#name) - 1;\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> continue;\</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-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -3540,7 +3540,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">parse_normalize_flags(grn_ctx *ctx, grn_obj *flag_names)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (((names_end - names) >= (sizeof(#name) - 1)) &&\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> (!memcmp(names, #name, sizeof(#name) - 1))) {\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> flags |= GRN_STRING_ ## name;\</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- names += sizeof(#name);\</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ names += sizeof(#name) - 1;\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> continue;\</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-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -3753,7 +3753,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">parse_tokenize_flags(grn_ctx *ctx, grn_obj *flag_names)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (((names_end - names) >= (sizeof(#name) - 1)) &&\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> (!memcmp(names, #name, sizeof(#name) - 1))) {\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> flags |= GRN_TOKEN_CURSOR_ ## name;\</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- names += sizeof(#name);\</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ names += sizeof(#name) - 1;\</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> continue;\</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>