Kouhei Sutou
null+****@clear*****
Mon Jul 27 17:43:57 JST 2015
Kouhei Sutou 2015-07-27 17:43:57 +0900 (Mon, 27 Jul 2015) New Revision: 4feabf364c7414f5b31fa4848dd81a516e9dea28 https://github.com/groonga/groonga/commit/4feabf364c7414f5b31fa4848dd81a516e9dea28 Message: Use grn_strncasecmp() Modified files: build/ac_macros/check_functions.m4 config.h.cmake include/groonga/portability.h plugins/query_expanders/tsv.c plugins/suggest/suggest.c src/groonga.c Modified: build/ac_macros/check_functions.m4 (+0 -1) =================================================================== --- build/ac_macros/check_functions.m4 2015-07-27 17:37:42 +0900 (02eb52f) +++ build/ac_macros/check_functions.m4 2015-07-27 17:43:57 +0900 (41b88ed) @@ -3,7 +3,6 @@ AC_CHECK_FUNCS(_gmtime64_s) AC_CHECK_FUNCS(_localtime64_s) AC_CHECK_FUNCS(_stricmp) -AC_CHECK_FUNCS(_strnicmp) AC_CHECK_FUNCS(_strtoui64) AC_CHECK_FUNCS(gmtime_r) AC_CHECK_FUNCS(localtime_r) Modified: config.h.cmake (+0 -1) =================================================================== --- config.h.cmake 2015-07-27 17:37:42 +0900 (755e513) +++ config.h.cmake 2015-07-27 17:43:57 +0900 (e314973) @@ -130,7 +130,6 @@ #cmakedefine HAVE__GMTIME64_S #cmakedefine HAVE__LOCALTIME64_S #cmakedefine HAVE__STRICMP -#cmakedefine HAVE__STRNICMP #cmakedefine HAVE__STRTOUI64 #cmakedefine HAVE_BACKTRACE #cmakedefine HAVE_CLOCK Modified: include/groonga/portability.h (+8 -0) =================================================================== --- include/groonga/portability.h 2015-07-27 17:37:42 +0900 (cc68542) +++ include/groonga/portability.h 2015-07-27 17:43:57 +0900 (20afb10) @@ -126,6 +126,14 @@ #endif /* WIN32 */ #ifdef WIN32 +# define grn_strncasecmp(string1, string2) \ + _strnicmp((string1), (string2)) +#else /* WIN32 */ +# define grn_strncasecmp(string1, string2) \ + strncasecmp((string1), (string2)) +#endif /* WIN32 */ + +#ifdef WIN32 # define grn_snprintf(dest, dest_size, n, format, ...) \ _snprintf_s((dest), (dest_size), (n) - 1, (format), __VA_ARGS__) #else /* WIN32 */ Modified: plugins/query_expanders/tsv.c (+9 -16) =================================================================== --- plugins/query_expanders/tsv.c 2015-07-27 17:37:42 +0900 (00550f6) +++ plugins/query_expanders/tsv.c 2015-07-27 17:43:57 +0900 (0f1914c) @@ -33,13 +33,6 @@ # include <share.h> #endif /* WIN32 */ -#ifdef HAVE__STRNICMP -# ifdef strncasecmp -# undef strncasecmp -# endif /* strncasecmp */ -# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) -#endif /* HAVE__STRNICMP */ - #define MAX_SYNONYM_BYTES 4096 static grn_hash *synonyms = NULL; @@ -95,19 +88,19 @@ detect_coding_part(grn_ctx *ctx, const char *line, size_t line_length) coding_part = strstr(c_line, coding_part_keyword); if (coding_part) { encoding_name = coding_part + strlen(coding_part_keyword); - if (strncasecmp(encoding_name, "utf-8", strlen("utf-8")) == 0 || - strncasecmp(encoding_name, "utf8", strlen("utf8")) == 0) { + if (grn_strncasecmp(encoding_name, "utf-8", strlen("utf-8")) == 0 || + grn_strncasecmp(encoding_name, "utf8", strlen("utf8")) == 0) { encoding = GRN_ENC_UTF8; - } else if (strncasecmp(encoding_name, "sjis", strlen("sjis")) == 0 || - strncasecmp(encoding_name, "Shift_JIS", strlen("Shift_JIS")) == 0) { + } else if (grn_strncasecmp(encoding_name, "sjis", strlen("sjis")) == 0 || + grn_strncasecmp(encoding_name, "Shift_JIS", strlen("Shift_JIS")) == 0) { encoding = GRN_ENC_SJIS; - } else if (strncasecmp(encoding_name, "EUC-JP", strlen("EUC-JP")) == 0 || - strncasecmp(encoding_name, "euc_jp", strlen("euc_jp")) == 0) { + } else if (grn_strncasecmp(encoding_name, "EUC-JP", strlen("EUC-JP")) == 0 || + grn_strncasecmp(encoding_name, "euc_jp", strlen("euc_jp")) == 0) { encoding = GRN_ENC_EUC_JP; - } else if (strncasecmp(encoding_name, "latin1", strlen("latin1")) == 0) { + } else if (grn_strncasecmp(encoding_name, "latin1", strlen("latin1")) == 0) { encoding = GRN_ENC_LATIN1; - } else if (strncasecmp(encoding_name, "KOI8-R", strlen("KOI8-R")) == 0 || - strncasecmp(encoding_name, "koi8r", strlen("koi8r")) == 0) { + } else if (grn_strncasecmp(encoding_name, "KOI8-R", strlen("KOI8-R")) == 0 || + grn_strncasecmp(encoding_name, "koi8r", strlen("koi8r")) == 0) { encoding = GRN_ENC_KOI8R; } } else { Modified: plugins/suggest/suggest.c (+2 -9) =================================================================== --- plugins/suggest/suggest.c 2015-07-27 17:37:42 +0900 (073f5e0) +++ plugins/suggest/suggest.c 2015-07-27 17:43:57 +0900 (7a11208) @@ -28,13 +28,6 @@ #include "grn_output.h" #include <groonga/plugin.h> -#ifdef HAVE__STRNICMP -# ifdef strncasecmp -# undef strncasecmp -# endif /* strcasecmp */ -# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) -#endif /* HAVE__STRNICMP */ - #define VAR GRN_PROC_GET_VAR_BY_OFFSET #define CONST_STR_LEN(x) x, x ? sizeof(x) - 1 : 0 #define TEXT_VALUE_LEN(x) GRN_TEXT_VALUE(x), GRN_TEXT_LEN(x) @@ -536,10 +529,10 @@ parse_search_mode(grn_ctx *ctx, grn_obj *mode_text) mode_length = GRN_TEXT_LEN(mode_text); if (mode_length == 3 && - strncasecmp("yes", GRN_TEXT_VALUE(mode_text), 3) == 0) { + grn_strncasecmp("yes", GRN_TEXT_VALUE(mode_text), 3) == 0) { mode = GRN_SUGGEST_SEARCH_YES; } else if (mode_length == 2 && - strncasecmp("no", GRN_TEXT_VALUE(mode_text), 2) == 0) { + grn_strncasecmp("no", GRN_TEXT_VALUE(mode_text), 2) == 0) { mode = GRN_SUGGEST_SEARCH_NO; } else { mode = GRN_SUGGEST_SEARCH_AUTO; Modified: src/groonga.c (+1 -8) =================================================================== --- src/groonga.c 2015-07-27 17:37:42 +0900 (19ff084) +++ src/groonga.c 2015-07-27 17:43:57 +0900 (87ce9f2) @@ -58,13 +58,6 @@ # include <sys/uio.h> #endif /* WIN32 */ -#ifdef HAVE__STRNICMP -# ifdef strncasecmp -# undef strncasecmp -# endif /* strcasecmp */ -# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) -#endif /* HAVE__STRNICMP */ - #ifndef USE_MSG_NOSIGNAL # ifdef MSG_NOSIGNAL # undef MSG_NOSIGNAL @@ -1040,7 +1033,7 @@ typedef struct { #define STRING_EQUAL_CI(string, string_length, constant_string)\ (string_length == strlen(constant_string) &&\ - strncasecmp(string, constant_string, string_length) == 0) + grn_strncasecmp(string, constant_string, string_length) == 0) static const char * do_htreq_post_parse_header_request_line(grn_ctx *ctx, -------------- next part -------------- HTML����������������������������...Download