foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api: fix type of value returned by functions utf8_prev_char, utf8_next_char and utf8_add_offset

v2.8-utf8proc
Sébastien Helleu 2015-07-04 08:39:55 +02:00
parent bd850398e8
commit 4ecd8a505f
22 changed files with 116 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.asciidoc
View File

@ -40,6 +40,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* core: fix bar item "scroll" after /buffer clear (closes #448)
* core: fix display of time in bare display when option
weechat.look.buffer_time_format is set to empty string (closes #441)
* api: fix type of value returned by functions strcasestr, utf8_prev_char,
utf8_next_char and utf8_add_offset
* api: fix type of value returned by function strcasestr
* fifo: fix send error on Cygwin when something is received in the pipe
(closes #436)

15
doc/en/weechat_plugin_api.en.asciidoc
View File

@ -2219,7 +2219,8 @@ Prototype:
[source,C]
----
char *weechat_utf8_prev_char (const char *string_start, const char *string);
const char *weechat_utf8_prev_char (const char *string_start,
const char *string);
----
Arguments:
@ -2236,7 +2237,7 @@ C example:
[source,C]
----
char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
const char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
----
[NOTE]
@ -2250,7 +2251,7 @@ Prototype:
[source,C]
----
char *weechat_utf8_next_char (const char *string);
const char *weechat_utf8_next_char (const char *string);
----
Arguments:
@ -2265,7 +2266,7 @@ C example:
[source,C]
----
char *next_char = weechat_utf8_next_char (string);
const char *next_char = weechat_utf8_next_char (string);
----
[NOTE]
@ -2522,7 +2523,7 @@ Prototype:
[source,C]
----
char *weechat_utf8_add_offset (const char *string, int offset);
const char *weechat_utf8_add_offset (const char *string, int offset);
----
Arguments:
@ -2538,8 +2539,8 @@ C example:
[source,C]
----
char *str = "chêne";
char *str2 = weechat_utf8_add_offset (str, 3); /* points to "ne" */
const char *str = "chêne";
const char *str2 = weechat_utf8_add_offset (str, 3); /* points to "ne" */
----
[NOTE]

15
doc/fr/weechat_plugin_api.fr.asciidoc
View File

@ -2261,7 +2261,8 @@ Prototype :
[source,C]
----
char *weechat_utf8_prev_char (const char *string_start, const char *string);
const char *weechat_utf8_prev_char (const char *string_start,
const char *string);
----
Paramètres :
@ -2279,7 +2280,7 @@ Exemple en C :
[source,C]
----
char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
const char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
----
[NOTE]
@ -2293,7 +2294,7 @@ Prototype :
[source,C]
----
char *weechat_utf8_next_char (const char *string);
const char *weechat_utf8_next_char (const char *string);
----
Paramètres :
@ -2309,7 +2310,7 @@ Exemple en C :
[source,C]
----
char *next_char = weechat_utf8_next_char (string);
const char *next_char = weechat_utf8_next_char (string);
----
[NOTE]
@ -2569,7 +2570,7 @@ Prototype :
[source,C]
----
char *weechat_utf8_add_offset (const char *string, int offset);
const char *weechat_utf8_add_offset (const char *string, int offset);
----
Paramètres :
@ -2586,8 +2587,8 @@ Exemple en C :
[source,C]
----
char *str = "chêne";
char *str2 = weechat_utf8_add_offset (str, 3); /* pointe vers "ne" */
const char *str = "chêne";
const char *str2 = weechat_utf8_add_offset (str, 3); /* pointe vers "ne" */
----
[NOTE]

15
doc/it/weechat_plugin_api.it.asciidoc
View File

@ -2293,7 +2293,8 @@ Prototipo:
[source,C]
----
char *weechat_utf8_prev_char (const char *string_start, const char *string);
const char *weechat_utf8_prev_char (const char *string_start,
const char *string);
----
Argomenti:
@ -2311,7 +2312,7 @@ Esempio in C:
[source,C]
----
char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
const char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
----
[NOTE]
@ -2325,7 +2326,7 @@ Prototipo:
[source,C]
----
char *weechat_utf8_next_char (const char *string);
const char *weechat_utf8_next_char (const char *string);
----
Argomenti:
@ -2341,7 +2342,7 @@ Esempio in C:
[source,C]
----
char *next_char = weechat_utf8_next_char (string);
const char *next_char = weechat_utf8_next_char (string);
----
[NOTE]
@ -2605,7 +2606,7 @@ Prototipo:
[source,C]
----
char *weechat_utf8_add_offset (const char *string, int offset);
const char *weechat_utf8_add_offset (const char *string, int offset);
----
Argomenti:
@ -2621,8 +2622,8 @@ Esempio in C:
[source,C]
----
char *str = "chêne";
char *str2 = weechat_utf8_add_offset (str, 3); /* points to "ne" */
const char *str = "chêne";
const char *str2 = weechat_utf8_add_offset (str, 3); /* points to "ne" */
----
[NOTE]

15
doc/ja/weechat_plugin_api.ja.asciidoc
View File

@ -2226,7 +2226,8 @@ weechat_utf8_normalize (string, '?');
[source,C]
----
char *weechat_utf8_prev_char (const char *string_start, const char *string);
const char *weechat_utf8_prev_char (const char *string_start,
const char *string);
----
引数:
@ -2243,7 +2244,7 @@ C 言語での使用例:
[source,C]
----
char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
const char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
----
[NOTE]
@ -2257,7 +2258,7 @@ char *prev_char = weechat_utf8_prev_char (string, ptr_in_string);
[source,C]
----
char *weechat_utf8_next_char (const char *string);
const char *weechat_utf8_next_char (const char *string);
----
引数:
@ -2272,7 +2273,7 @@ C 言語での使用例:
[source,C]
----
char *next_char = weechat_utf8_next_char (string);
const char *next_char = weechat_utf8_next_char (string);
----
[NOTE]
@ -2529,7 +2530,7 @@ UTF-8 文字列で N 文字前に進む。
[source,C]
----
char *weechat_utf8_add_offset (const char *string, int offset);
const char *weechat_utf8_add_offset (const char *string, int offset);
----
引数:
@ -2545,8 +2546,8 @@ C 言語での使用例:
[source,C]
----
char *str = "chêne";
char *str2 = weechat_utf8_add_offset (str, 3); /* points to "ne" */
const char *str = "chêne";
const char *str2 = weechat_utf8_add_offset (str, 3); /* points to "ne" */
----
[NOTE]

6
src/core/wee-hook.c
View File

@ -422,7 +422,8 @@ hook_command_build_completion (struct t_hook_command *hook_command)
int i, j, k, length, num_items;
struct t_weelist *list;
char *pos_completion, *pos_double_pipe, *pos_start, *pos_end;
char **items, *last_space, *ptr_template;
char **items;
const char *last_space, *ptr_template;
/* split templates using "||" as separator */
hook_command->cplt_num_templates = 1;
@ -673,7 +674,8 @@ hook_command_exec (struct t_gui_buffer *buffer, int any_plugin,
struct t_hook *ptr_hook, *next_hook;
struct t_hook *hook_plugin, *hook_other_plugin, *hook_other_plugin2;
struct t_hook *hook_incomplete_command;
char **argv, **argv_eol, *ptr_command_name;
char **argv, **argv_eol;
const char *ptr_command_name;
int argc, rc, length_command_name, allow_incomplete_commands;
int count_other_plugin, count_incomplete_commands;

13
src/core/wee-string.c
View File

@ -104,7 +104,7 @@ string_tolower (char *string)
{
if ((string[0] >= 'A') && (string[0] <= 'Z'))
string[0] += ('a' - 'A');
string = utf8_next_char (string);
string = (char *)utf8_next_char (string);
}
}
@ -119,7 +119,7 @@ string_toupper (char *string)
{
if ((string[0] >= 'a') && (string[0] <= 'z'))
string[0] -= ('a' - 'A');
string = utf8_next_char (string);
string = (char *)utf8_next_char (string);
}
}
@ -1851,7 +1851,7 @@ string_split_shell (const char *string, int *num_items)
{
add_char_to_temp = 0;
add_temp_to_args = 0;
ptr_next = utf8_next_char (ptr_string);
ptr_next = (char *)utf8_next_char (ptr_string);
saved_char = ptr_next[0];
ptr_next[0] = '\0';
if (state == ' ')
@ -2180,8 +2180,8 @@ string_iconv (int from_utf8, const char *from_code, const char *to_code,
#ifdef HAVE_ICONV
iconv_t cd;
char *inbuf, *ptr_inbuf, *ptr_outbuf, *next_char;
char *ptr_inbuf_shift;
char *inbuf, *ptr_outbuf;
const char *ptr_inbuf, *ptr_inbuf_shift, *next_char;
int done;
size_t err, inbytesleft, outbytesleft;
#endif /* HAVE_ICONV */
@ -2711,7 +2711,8 @@ string_is_command_char (const char *string)
const char *
string_input_for_buffer (const char *string)
{
char *pos_slash, *pos_space, *next_char;
char *pos_slash, *pos_space;
const char *next_char;
if (!string)
return NULL;

10
src/core/wee-utf8.c
View File

@ -179,7 +179,7 @@ utf8_normalize (char *string, char replacement)
* "string_start" was reached).
*/
char *
const char *
utf8_prev_char (const char *string_start, const char *string)
{
if (!string || (string <= string_start))
@ -222,7 +222,7 @@ utf8_prev_char (const char *string_start, const char *string)
* Returns pointer to next UTF-8 char, NULL if string was NULL.
*/
char *
const char *
utf8_next_char (const char *string)
{
if (!string)
@ -673,7 +673,7 @@ utf8_char_size_screen (const char *string)
* Returns pointer to the new position in string.
*/
char *
const char *
utf8_add_offset (const char *string, int offset)
{
if (!string)
@ -684,7 +684,7 @@ utf8_add_offset (const char *string, int offset)
string = utf8_next_char (string);
offset--;
}
return (char *)string;
return string;
}
/*
@ -701,7 +701,7 @@ int
utf8_real_pos (const char *string, int pos)
{
int count, real_pos;
char *next_char;
const char *next_char;
if (!string)
return pos;

7
src/core/wee-utf8.h
View File

@ -32,8 +32,9 @@ extern void utf8_init ();
extern int utf8_has_8bits (const char *string);
extern int utf8_is_valid (const char *string, char **error);
extern void utf8_normalize (char *string, char replacement);
extern char *utf8_prev_char (const char *string_start, const char *string);
extern char *utf8_next_char (const char *string);
extern const char *utf8_prev_char (const char *string_start,
const char *string);
extern const char *utf8_next_char (const char *string);
extern int utf8_char_int (const char *string);
extern void utf8_int_string (unsigned int unicode_value, char *string);
extern wint_t utf8_wide_char (const char *string);
@ -46,7 +47,7 @@ extern int utf8_charcasecmp (const char *string1, const char *string2);
extern int utf8_charcasecmp_range (const char *string1, const char *string2,
int range);
extern int utf8_char_size_screen (const char *string);
extern char *utf8_add_offset (const char *string, int offset);
extern const char *utf8_add_offset (const char *string, int offset);
extern int utf8_real_pos (const char *string, int pos);
extern int utf8_pos (const char *string, int real_pos);
extern char *utf8_strndup (const char *string, int length);

3
src/core/wee-util.c
View File

@ -718,7 +718,8 @@ util_file_get_content (const char *filename)
int
util_version_number (const char *version)
{
char **items, buf[64], *ptr_item, *error;
char **items, buf[64], *error;
const char *ptr_item;
int num_items, i, version_int[4], index_buf;
long number;

2
src/gui/curses/gui-curses-bar-window.c
View File

@ -332,7 +332,7 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window,
1);
break;
default:
next_char = utf8_next_char (string);
next_char = (char *)utf8_next_char (string);
if (!next_char)
break;

7
src/gui/curses/gui-curses-chat.c
View File

@ -394,7 +394,7 @@ gui_chat_display_word_raw (struct t_gui_window *window, struct t_gui_line *line,
if (!string)
return chars_displayed;
next_char = utf8_next_char (string);
next_char = (char *)utf8_next_char (string);
if (next_char)
{
ptr_char = utf_char;
@ -1231,8 +1231,9 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
int read_marker_x, read_marker_y;
int word_start_offset, word_end_offset;
int word_length_with_spaces, word_length;
char *ptr_data, *ptr_end_offset, *next_char;
char *ptr_style, *message_with_tags, *message_with_search;
char *ptr_data, *ptr_end_offset;
char *message_with_tags, *message_with_search;
const char *ptr_style, *next_char;
struct t_gui_line *ptr_prev_line, *ptr_next_line;
struct tm local_time, local_time2;
struct timeval tv_time;

2
src/gui/curses/gui-curses-key.c
View File

@ -380,7 +380,7 @@ gui_key_flush (int paste)
(void) utf8_is_valid (ptr_char, &ptr_error);
if (!ptr_error)
break;
next_char = utf8_next_char (ptr_error);
next_char = (char *)utf8_next_char (ptr_error);
if (next_char && next_char[0])
{
ptr_char = ptr_error;

2
src/gui/curses/gui-curses-mouse.c
View File

@ -255,7 +255,7 @@ gui_mouse_event_code2key (const char *code)
int i, x, y, code_utf8, length;
double diff_x, diff_y, distance, angle, pi4;
static char key[128];
char *ptr_code;
const char *ptr_code;
key[0] = '\0';

4
src/gui/gui-chat.c
View File

@ -326,8 +326,8 @@ gui_chat_get_word_info (struct t_gui_window *window,
int *word_start_offset, int *word_end_offset,
int *word_length_with_spaces, int *word_length)
{
const char *start_data;
char *next_char, *next_char2;
char *next_char;
const char *start_data, *next_char2;
int leading_spaces, char_size_screen;
*word_start_offset = 0;

5
src/gui/gui-completion.c
View File

@ -706,8 +706,7 @@ gui_completion_find_context (struct t_gui_completion *completion,
const char *data, int size, int pos)
{
int i, command_arg, pos_start, pos_end;
const char *ptr_command, *ptr_data;
char *prev_char;
const char *ptr_command, *ptr_data, *prev_char;
/* look for context */
gui_completion_free_data (completion);
@ -913,7 +912,7 @@ int
gui_completion_common_prefix_size (struct t_arraylist *list,
const char *utf_char)
{
char *ptr_first_item, *ptr_char, *next_char;
const char *ptr_first_item, *ptr_char, *next_char;
struct t_gui_completion_word *ptr_completion_word;
int i;

66
src/gui/gui-input.c
View File

@ -270,11 +270,11 @@ gui_input_insert_string (struct t_gui_buffer *buffer, const char *string,
buffer->input_buffer[buffer->input_buffer_size] = '\0';
/* move end of string to the right */
ptr_start = utf8_add_offset (buffer->input_buffer, pos);
ptr_start = (char *)utf8_add_offset (buffer->input_buffer, pos);
memmove (ptr_start + size, ptr_start, strlen (ptr_start));
/* insert new string */
ptr_start = utf8_add_offset (buffer->input_buffer, pos);
ptr_start = (char *)utf8_add_offset (buffer->input_buffer, pos);
strncpy (ptr_start, string_utf8, size);
buffer->input_buffer_pos += length;
@ -751,9 +751,9 @@ gui_input_delete_previous_char (struct t_gui_buffer *buffer)
if (buffer->input && (buffer->input_buffer_pos > 0))
{
gui_buffer_undo_snap (buffer);
pos = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
pos_last = utf8_prev_char (buffer->input_buffer, pos);
pos = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
pos_last = (char *)utf8_prev_char (buffer->input_buffer, pos);
char_size = pos - pos_last;
size_to_move = strlen (pos);
memmove (pos_last, pos, size_to_move);
@ -782,9 +782,9 @@ gui_input_delete_next_char (struct t_gui_buffer *buffer)
&& (buffer->input_buffer_pos < buffer->input_buffer_length))
{
gui_buffer_undo_snap (buffer);
pos = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
pos_next = utf8_next_char (pos);
pos = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
pos_next = (char *)utf8_next_char (pos);
char_size = pos_next - pos;
size_to_move = strlen (pos_next);
memmove (pos, pos_next, size_to_move);
@ -811,30 +811,30 @@ gui_input_delete_previous_word (struct t_gui_buffer *buffer)
if (buffer->input && (buffer->input_buffer_pos > 0))
{
gui_buffer_undo_snap (buffer);
start = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos - 1);
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos - 1);
string = start;
while (string && !string_is_word_char_input (string))
{
string = utf8_prev_char (buffer->input_buffer, string);
string = (char *)utf8_prev_char (buffer->input_buffer, string);
}
if (string)
{
while (string && string_is_word_char_input (string))
{
string = utf8_prev_char (buffer->input_buffer, string);
string = (char *)utf8_prev_char (buffer->input_buffer, string);
}
if (string)
{
while (string && !string_is_word_char_input (string))
{
string = utf8_prev_char (buffer->input_buffer, string);
string = (char *)utf8_prev_char (buffer->input_buffer, string);
}
}
}
if (string)
string = utf8_next_char (utf8_next_char (string));
string = (char *)utf8_next_char (utf8_next_char (string));
else
string = buffer->input_buffer;
@ -869,15 +869,15 @@ gui_input_delete_next_word (struct t_gui_buffer *buffer)
if (buffer->input)
{
gui_buffer_undo_snap (buffer);
start = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
string = start;
length_deleted = 0;
while (string[0])
{
if (!string_is_word_char_input (string) && (string > start))
break;
string = utf8_next_char (string);
string = (char *)utf8_next_char (string);
length_deleted++;
}
size_deleted = string - start;
@ -910,8 +910,8 @@ gui_input_delete_beginning_of_line (struct t_gui_buffer *buffer)
if (buffer->input && (buffer->input_buffer_pos > 0))
{
gui_buffer_undo_snap (buffer);
start = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
size_deleted = start - buffer->input_buffer;
length_deleted = utf8_strnlen (buffer->input_buffer, size_deleted);
gui_input_clipboard_copy (buffer->input_buffer,
@ -943,8 +943,8 @@ gui_input_delete_end_of_line (struct t_gui_buffer *buffer)
if (buffer->input)
{
gui_buffer_undo_snap (buffer);
start = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
size_deleted = strlen (start);
gui_input_clipboard_copy (start, size_deleted);
start[0] = '\0';
@ -996,9 +996,9 @@ gui_input_transpose_chars (struct t_gui_buffer *buffer)
if (buffer->input_buffer_pos == buffer->input_buffer_length)
buffer->input_buffer_pos--;
start = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
prev_char = utf8_prev_char (buffer->input_buffer, start);
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
prev_char = (char *)utf8_prev_char (buffer->input_buffer, start);
size_prev_char = start - prev_char;
size_start_char = utf8_char_size (start);
@ -1085,20 +1085,20 @@ gui_input_move_previous_word (struct t_gui_buffer *buffer)
if (buffer->input
&& (buffer->input_buffer_pos > 0))
{
pos = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos - 1);
pos = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos - 1);
while (pos && !string_is_word_char_input (pos))
{
pos = utf8_prev_char (buffer->input_buffer, pos);
pos = (char *)utf8_prev_char (buffer->input_buffer, pos);
}
if (pos)
{
while (pos && string_is_word_char_input (pos))
{
pos = utf8_prev_char (buffer->input_buffer, pos);
pos = (char *)utf8_prev_char (buffer->input_buffer, pos);
}
if (pos)
pos = utf8_next_char (pos);
pos = (char *)utf8_next_char (pos);
else
pos = buffer->input_buffer;
buffer->input_buffer_pos = utf8_pos (buffer->input_buffer,
@ -1124,17 +1124,17 @@ gui_input_move_next_word (struct t_gui_buffer *buffer)
if (buffer->input
&& (buffer->input_buffer_pos < buffer->input_buffer_length))
{
pos = utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
pos = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
while (pos[0] && !string_is_word_char_input (pos))
{
pos = utf8_next_char (pos);
pos = (char *)utf8_next_char (pos);
}
if (pos[0])
{
while (pos[0] && string_is_word_char_input (pos))
{
pos = utf8_next_char (pos);
pos = (char *)utf8_next_char (pos);
}
if (pos[0])
{

2
src/gui/gui-window.c
View File

@ -141,7 +141,7 @@ gui_window_get_context_at_xy (struct t_gui_window *window,
{
int win_x, win_y;
char *ptr_data, *data_next_line, *str_temp;
char *word_start, *word_end, *last_space;
const char *word_start, *word_end, *last_space;
*chat = 0;
*line = NULL;

8
src/plugins/alias/alias.c
View File

@ -688,13 +688,13 @@ alias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
{
ptr_completion = argv[2];
ptr_alias_name = (weechat_string_is_command_char (argv[3])) ?
weechat_utf8_next_char (argv[3]) : argv[3];
(char *)weechat_utf8_next_char (argv[3]) : argv[3];
ptr_command = argv_eol[4];
}
else
{
ptr_alias_name = (weechat_string_is_command_char (argv[1])) ?
weechat_utf8_next_char (argv[1]) : argv[1];
(char *)weechat_utf8_next_char (argv[1]) : argv[1];
ptr_command = argv_eol[2];
}
@ -735,7 +735,7 @@ alias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
{
/* get pointer to alias name */
ptr_alias_name = (weechat_string_is_command_char (argv[1])) ?
weechat_utf8_next_char (argv[1]) : argv[1];
(char *)weechat_utf8_next_char (argv[1]) : argv[1];
/* display list of aliases */
alias_found = 0;
@ -790,7 +790,7 @@ unalias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
for (i = 1; i < argc; i++)
{
alias_name = (weechat_string_is_command_char (argv[i])) ?
weechat_utf8_next_char (argv[i]) : argv[i];
(char *)weechat_utf8_next_char (argv[i]) : argv[i];
ptr_alias = alias_search (alias_name);
if (!ptr_alias)
{

10
src/plugins/aspell/weechat-aspell.c
View File

@ -708,7 +708,7 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
pos_space = ptr_string;
while (pos_space && pos_space[0] && (pos_space[0] != ' '))
{
pos_space = weechat_utf8_next_char (pos_space);
pos_space = (char *)weechat_utf8_next_char (pos_space);
}
if (!pos_space || !pos_space[0])
{
@ -766,7 +766,7 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
/* find end of word: ' and - allowed in word, but not at the end */
ptr_end_valid = ptr_string;
ptr_end = weechat_utf8_next_char (ptr_string);
ptr_end = (char *)weechat_utf8_next_char (ptr_string);
code_point = weechat_utf8_char_int (ptr_end);
while (iswalnum (code_point) || (code_point == '\'')
|| (code_point == '-'))
@ -778,12 +778,12 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
ptr_end_valid = ptr_end;
word_end_pos_valid = word_end_pos;
}
ptr_end = weechat_utf8_next_char (ptr_end);
ptr_end = (char *)weechat_utf8_next_char (ptr_end);
if (!ptr_end[0])
break;
code_point = weechat_utf8_char_int (ptr_end);
}
ptr_end = weechat_utf8_next_char (ptr_end_valid);
ptr_end = (char *)weechat_utf8_next_char (ptr_end_valid);
word_end_pos = word_end_pos_valid;
word_ok = 0;
if (weechat_aspell_string_is_url (ptr_string)
@ -799,7 +799,7 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
code_point = weechat_utf8_char_int (ptr_end);
while (!iswspace (code_point))
{
ptr_end = weechat_utf8_next_char (ptr_end);
ptr_end = (char *)weechat_utf8_next_char (ptr_end);
if (!ptr_end[0])
break;
code_point = weechat_utf8_char_int (ptr_end);

9
src/plugins/weechat-plugin.h
View File

@ -57,7 +57,7 @@ struct timeval;
* please change the date with current one; for a second change at same
* date, increment the 01, otherwise please keep 01.
*/
#define WEECHAT_PLUGIN_API_VERSION "20150703-01"
#define WEECHAT_PLUGIN_API_VERSION "20150704-01"
/* macros for defining plugin infos */
#define WEECHAT_PLUGIN_NAME(__name) \
@ -319,8 +319,9 @@ struct t_weechat_plugin
int (*utf8_has_8bits) (const char *string);
int (*utf8_is_valid) (const char *string, char **error);
void (*utf8_normalize) (char *string, char replacement);
char *(*utf8_prev_char) (const char *string_start, const char *string);
char *(*utf8_next_char) (const char *string);
const char *(*utf8_prev_char) (const char *string_start,
const char *string);
const char *(*utf8_next_char) (const char *string);
int (*utf8_char_int) (const char *string);
int (*utf8_char_size) (const char *string);
int (*utf8_strlen) (const char *string);
@ -329,7 +330,7 @@ struct t_weechat_plugin
int (*utf8_charcmp) (const char *string1, const char *string2);
int (*utf8_charcasecmp) (const char *string1, const char *string2);
int (*utf8_char_size_screen) (const char *string);
char *(*utf8_add_offset) (const char *string, int offset);
const char *(*utf8_add_offset) (const char *string, int offset);
int (*utf8_real_pos) (const char *string, int pos);
int (*utf8_pos) (const char *string, int real_pos);
char *(*utf8_strndup) (const char *string, int length);

2
tests/unit/core/test-utf8.cpp
View File

@ -125,7 +125,7 @@ TEST(Utf8, Normalize)
TEST(Utf8, Move)
{
char *ptr;
const char *ptr;
/* previous/next char */
POINTERS_EQUAL(NULL, utf8_prev_char (NULL, NULL));