pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-06 01:33:12 +02:00
Code Activity

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

Browse Source
This commit is contained in:
Sébastien Helleu
2015-07-04 08:39:55 +02:00
parent bd850398e8
commit 4ecd8a505f
22 changed files with 116 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/curses/gui-curses-bar-window.c
+1 -1
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;
src/gui/curses/gui-curses-chat.c
+4 -3
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;
src/gui/curses/gui-curses-key.c
+1 -1
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;
src/gui/curses/gui-curses-mouse.c
+1 -1
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';
src/gui/gui-chat.c
+2 -2
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;
src/gui/gui-completion.c
+2 -3
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;
src/gui/gui-input.c
+33 -33
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])
{
src/gui/gui-window.c
+1 -1
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;