[Groonga-commit] groonga/groonga at a013813 [master] windows: stop to use ifdef in var arguments

Back to archive index

Kouhei Sutou null+****@clear*****
Sun Oct 18 11:57:49 JST 2015


Kouhei Sutou	2015-10-18 11:57:49 +0900 (Sun, 18 Oct 2015)

  New Revision: a013813520b8e78c3c546494da670645983c6e22
  https://github.com/groonga/groonga/commit/a013813520b8e78c3c546494da670645983c6e22

  Message:
    windows: stop to use ifdef in var arguments

  Modified files:
    plugins/tokenizers/mecab.c

  Modified: plugins/tokenizers/mecab.c (+11 -11)
===================================================================
--- plugins/tokenizers/mecab.c    2015-10-18 11:54:26 +0900 (9057778)
+++ plugins/tokenizers/mecab.c    2015-10-18 11:57:49 +0900 (42b0b71)
@@ -304,19 +304,19 @@ mecab_create(grn_ctx *ctx)
   mecab = mecab_new(argc, (char **)argv);
 
   if (!mecab) {
-    GRN_PLUGIN_ERROR(ctx, GRN_TOKENIZER_ERROR,
-                     "[tokenizer][mecab] "
-                     "failed to create mecab_t: mecab_new("
-                     "\"%s\", \"%s\""
-#ifdef GRN_WITH_BUNDLED_MECAB
-                     ", \"%s\", \"%s\""
-#endif /* GRN_WITH_BUNDLED_MECAB */
-                     "): %s",
-                     argv[0], argv[1],
 #ifdef GRN_WITH_BUNDLED_MECAB
-                     argv[2], argv[3],
+    GRN_PLUGIN_ERROR(ctx, GRN_TOKENIZER_ERROR,
+                     "[tokenizer][mecab] failed to create mecab_t: %s: "
+                     "mecab_new(\"%s\", \"%s\", \"%s\", \"%s\")"
+                     mecab_global_error_message(),
+                     argv[0], argv[1], argv[2], argv[3]);
+#else /* GRN_WITH_BUNDLED_MECAB */
+    GRN_PLUGIN_ERROR(ctx, GRN_TOKENIZER_ERROR,
+                     "[tokenizer][mecab] failed to create mecab_t: %s: "
+                     "mecab_new(\"%s\", \"%s\")",
+                     mecab_global_error_message(),
+                     argv[0], argv[1]);
 #endif /* GRN_WITH_BUNDLED_MECAB */
-                     mecab_global_error_message());
   }
 
   return mecab;
-------------- next part --------------
HTML����������������������������...
Download 



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