[Groonga-commit] groonga/groonga at 2c7c182 [master] Use correct function name in error message

Back to archive index

Kouhei Sutou null+****@clear*****
Fri Jan 30 15:01:32 JST 2015


Kouhei Sutou	2015-01-30 15:01:32 +0900 (Fri, 30 Jan 2015)

  New Revision: 2c7c18223b9bc8f22a046e96b8f863633f7fe9f9
  https://github.com/groonga/groonga/commit/2c7c18223b9bc8f22a046e96b8f863633f7fe9f9

  Message:
    Use correct function name in error message

  Modified files:
    lib/ctx.c

  Modified: lib/ctx.c (+5 -1)
===================================================================
--- lib/ctx.c    2015-01-30 14:59:44 +0900 (668cd34)
+++ lib/ctx.c    2015-01-30 15:01:32 +0900 (b0480ed)
@@ -133,21 +133,25 @@ grn_rc
 grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf)
 {
   struct tm *ltm;
+  const char *function_name;
 #ifdef HAVE_LOCALTIME_S
   struct tm tm;
   time_t t = tv->tv_sec;
+  function_name = "localtime_s";
   ltm = (localtime_s(&tm, &t) == 0) ? &tm : NULL;
 #else /* HAVE_LOCALTIME_S */
 # ifdef HAVE_LOCALTIME_R
   struct tm tm;
   time_t t = tv->tv_sec;
+  function_name = "localtime_r";
   ltm = localtime_r(&t, &tm);
 # else /* HAVE_LOCALTIME_R */
   time_t tvsec = (time_t) tv->tv_sec;
+  function_name = "localtime";
   ltm = localtime(&tvsec);
 # endif /* HAVE_LOCALTIME_R */
 #endif /* HAVE_LOCALTIME_S */
-  if (!ltm) { SERR("localtime"); }
+  if (!ltm) { SERR(function_name); }
   snprintf(buf, GRN_TIMEVAL_STR_SIZE - 1, GRN_TIMEVAL_STR_FORMAT,
            ltm->tm_year + 1900, ltm->tm_mon + 1, ltm->tm_mday,
            ltm->tm_hour, ltm->tm_min, ltm->tm_sec,
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index