[Groonga-commit] groonga/groonga at 73c149f [master] windows: convert image path to grn_encoding

Back to archive index

Kouhei Sutou null+****@clear*****
Fri Jun 22 09:07:39 JST 2018


Kouhei Sutou	2018-06-22 09:07:39 +0900 (Fri, 22 Jun 2018)

  New Revision: 73c149fa4393b2299222141d7655e042a22fbc24
  https://github.com/groonga/groonga/commit/73c149fa4393b2299222141d7655e042a22fbc24

  Message:
    windows: convert image path to grn_encoding

  Modified files:
    lib/ctx.c

  Modified: lib/ctx.c (+10 -1)
===================================================================
--- lib/ctx.c    2018-06-22 09:07:07 +0900 (b3a2024e3)
+++ lib/ctx.c    2018-06-22 09:07:39 +0900 (50efcd47c)
@@ -22,6 +22,7 @@
 #include "grn_request_timer.h"
 #include "grn_tokenizers.h"
 #include "grn_ctx_impl.h"
+#include "grn_encoding.h"
 #include "grn_ii.h"
 #include "grn_pat.h"
 #include "grn_index_column.h"
@@ -1780,6 +1781,11 @@ exception_filter(EXCEPTION_POINTERS *info)
 
     {
       const char *unknown = "(unknown)";
+      const char *grn_encoding_image_name = unknown;
+      if (have_module_name) {
+        grn_encoding_image_name =
+          grn_encoding_convert_from_locale(ctx, module.ImageName, -1, NULL);
+      }
       GRN_LOG(ctx, GRN_LOG_CRIT,
               "%s:%lu:%lu: %.*s(): <%s>: <%s>",
               (have_location ? line.FileName : unknown),
@@ -1788,7 +1794,10 @@ exception_filter(EXCEPTION_POINTERS *info)
               (int)(have_symbol_name ? symbol->NameLen : strlen(unknown)),
               (have_symbol_name ? symbol->Name : unknown),
               (have_module_name ? module.ModuleName : unknown),
-              (have_module_name ? module.ImageName : unknown));
+              grn_encoding_image_name);
+      if (have_module_name) {
+        grn_encoding_converted_free(ctx, grn_encoding_image_name);
+      }
     }
 
     previous_address = address;
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180622/f13cf8f0/attachment-0001.htm 



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