<!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-30 15:01:32 +0900 (Fri, 30 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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9">2c7c18223b9bc8f22a046e96b8f863633f7fe9f9</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">Use correct function name in error message</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#diff-0">lib/ctx.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/ctx.c (+5 -1)</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L132">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L133">133</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L134">134</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L135">135</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L136">136</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L137">137</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L138">138</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L139">139</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L140">140</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L141">141</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L142">142</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L143">143</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L144">144</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L145">145</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L146">146</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L147">147</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L148">148</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L149">149</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L150">150</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L151">151</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L152">152</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0L153">153</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R132">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R133">133</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R134">134</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R135">135</a></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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R136">136</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R137">137</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R138">138</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R139">139</a></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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R140">140</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R141">141</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R142">142</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R143">143</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R144">144</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R145">145</a></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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R146">146</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R147">147</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R148">148</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R149">149</a></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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R150">150</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R151">151</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R152">152</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R153">153</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/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R154">154</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R155">155</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R156">156</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9#L0R157">157</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">@@ -133,21 +133,25 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_rc</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> struct tm *ltm;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ const char *function_name;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #ifdef HAVE_LOCALTIME_S</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> struct tm tm;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> time_t t = tv->tv_sec;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ function_name = "localtime_s";</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ltm = (localtime_s(&tm, &t) == 0) ? &tm : NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #else /* HAVE_LOCALTIME_S */</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # ifdef HAVE_LOCALTIME_R</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> struct tm tm;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> time_t t = tv->tv_sec;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ function_name = "localtime_r";</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ltm = localtime_r(&t, &tm);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # else /* HAVE_LOCALTIME_R */</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> time_t tvsec = (time_t) tv->tv_sec;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ function_name = "localtime";</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ltm = localtime(&tvsec);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # endif /* HAVE_LOCALTIME_R */</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #endif /* HAVE_LOCALTIME_S */</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (!ltm) { SERR("localtime"); }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!ltm) { SERR(function_name); }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> snprintf(buf, GRN_TIMEVAL_STR_SIZE - 1, GRN_TIMEVAL_STR_FORMAT,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ltm->tm_year + 1900, ltm->tm_mon + 1, ltm->tm_mday,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ltm->tm_hour, ltm->tm_min, ltm->tm_sec,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>