aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge pull request #1092 from frnky/remove_mblen

Browse Source 
Don't call mblen() to not depend on locale
This commit is contained in:
Michael Vetter 2019-05-23 21:18:46 +02:00 committed by GitHub
commit eb16c674ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common.c
View File

@ -410,9 +410,6 @@ prof_occurrences(const char *const needle, const char *const haystack, int offse
gchar *haystack_curr = g_utf8_offset_to_pointer(haystack, offset); gchar *haystack_curr = g_utf8_offset_to_pointer(haystack, offset);
if (g_str_has_prefix(haystack_curr, needle)) { if (g_str_has_prefix(haystack_curr, needle)) {
if (whole_word) { if (whole_word) {
gchar *needle_last_ch = g_utf8_offset_to_pointer(needle, g_utf8_strlen(needle, -1)- 1);
int needle_last_ch_len = mblen(needle_last_ch, MB_CUR_MAX);
gunichar before = 0; gunichar before = 0;
gchar *haystack_before_ch = g_utf8_find_prev_char(haystack, haystack_curr); gchar *haystack_before_ch = g_utf8_find_prev_char(haystack, haystack_curr);
if (haystack_before_ch) { if (haystack_before_ch) {
@ -420,8 +417,8 @@ prof_occurrences(const char *const needle, const char *const haystack, int offse
} }
gunichar after = 0; gunichar after = 0;
gchar *haystack_after_ch = g_utf8_find_next_char(haystack_curr + strlen(needle) - needle_last_ch_len, NULL); gchar *haystack_after_ch = haystack_curr + strlen(needle);
if (haystack_after_ch) { if (haystack_after_ch[0] != '\0') {
after = g_utf8_get_char(haystack_after_ch); after = g_utf8_get_char(haystack_after_ch);
} }