mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'm-utf-8' of ssh://angel_il@midnight-commander.org:2222/git/mc into m-utf-8

Browse Source
This commit is contained in:
Ilia Maslakov 2009-04-20 09:03:04 +00:00
commit 78b7678845
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
edit/editcmd.c
View File

@ -1489,6 +1489,7 @@ edit_find_string (long start, unsigned char *exp, int *len, long last_byte, edit
int n = 0; int n = 0;
gchar *tmp_exp1, *tmp_exp2; gchar *tmp_exp1, *tmp_exp2;
unsigned char *tmp_exp3; unsigned char *tmp_exp3;
char *tmp_exp4;
gchar *c; gchar *c;
for (p = 0; p < l; p++) /* count conversions... */ for (p = 0; p < l; p++) /* count conversions... */
@ -1512,10 +1513,12 @@ edit_find_string (long start, unsigned char *exp, int *len, long last_byte, edit
buf[p - start] = *(*get_byte) (data, p); buf[p - start] = *(*get_byte) (data, p);
} else { } else {
tmp_exp3 = exp; tmp_exp3 = exp;
tmp_exp4 = (char *)tmp_exp3;
tmp_exp1 = tmp_exp2 = g_strdup((gchar *)exp); tmp_exp1 = tmp_exp2 = g_strdup((gchar *)exp);
tmp_len = str_length((char *)exp); tmp_len = str_length((char *)exp);
while (str_tolower(tmp_exp1, &tmp_exp3, &tmp_len)) while (str_tolower(tmp_exp1, (char **) &tmp_exp4, &tmp_len))
tmp_exp1+=str_length_char(tmp_exp1); tmp_exp1+=str_length_char(tmp_exp1);
g_free(tmp_exp2); g_free(tmp_exp2);
@ -1653,7 +1656,8 @@ edit_find_string (long start, unsigned char *exp, int *len, long last_byte, edit
tmp_exp3 = exp; tmp_exp3 = exp;
tmp_exp1 = tmp_exp2 = g_strdup((gchar *)exp); tmp_exp1 = tmp_exp2 = g_strdup((gchar *)exp);
tmp_len = strlen((char *) exp); tmp_len = strlen((char *) exp);
while (str_tolower(tmp_exp1, &tmp_exp3, &tmp_len)) tmp_exp4 = (char *) tmp_exp3;
while (str_tolower(tmp_exp1, &tmp_exp4, &tmp_len))
tmp_exp1+=str_length_char(tmp_exp1); tmp_exp1+=str_length_char(tmp_exp1);
g_free(tmp_exp2); g_free(tmp_exp2);
@ -3149,7 +3153,7 @@ edit_select_definition_dialog (WEdit * edit, char *match_expr, int max_len, int
int start_x, start_y, offset, i; int start_x, start_y, offset, i;
char *curr = NULL; char *curr = NULL;
etags_hash_t *curr_def; etags_hash_t *curr_def = NULL;
Dlg_head *def_dlg; Dlg_head *def_dlg;
WListbox *def_list; WListbox *def_list;
int def_dlg_h; /* dialog height */ int def_dlg_h; /* dialog height */
@ -3199,7 +3203,8 @@ edit_select_definition_dialog (WEdit * edit, char *match_expr, int max_len, int
/* apply the choosen completion */ /* apply the choosen completion */
if ( def_dlg->ret_value == B_ENTER ) { if ( def_dlg->ret_value == B_ENTER ) {
listbox_get_current (def_list, &curr, (etags_hash_t *) &curr_def); char *tmp_curr_def = (char *) curr_def;
listbox_get_current (def_list, &curr, &tmp_curr_def);
int do_moveto = 0; int do_moveto = 0;
if ( edit->modified ) { if ( edit->modified ) {
if ( !edit_query_dialog2 if ( !edit_query_dialog2
@ -3225,7 +3230,7 @@ edit_select_definition_dialog (WEdit * edit, char *match_expr, int max_len, int
edit->curs_row + 1; edit->curs_row + 1;
edit_stack_iterator++; edit_stack_iterator++;
g_free( edit_history_moveto[edit_stack_iterator].filename ); g_free( edit_history_moveto[edit_stack_iterator].filename );
edit_history_moveto[edit_stack_iterator].filename = g_strdup(curr_def->fullpath); edit_history_moveto[edit_stack_iterator].filename = g_strdup((char *)curr_def->fullpath);
edit_history_moveto[edit_stack_iterator].line = curr_def->line; edit_history_moveto[edit_stack_iterator].line = curr_def->line;
edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].filename, edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].filename,
edit_history_moveto[edit_stack_iterator].line); edit_history_moveto[edit_stack_iterator].line);

8
src/charsets.c
View File

@ -39,8 +39,8 @@ struct codepage_desc *codepages;
unsigned char conv_displ[256]; unsigned char conv_displ[256];
unsigned char conv_input[256]; unsigned char conv_input[256];
static char *cp_display = NULL; static const char *cp_display = NULL;
static char *cp_source = NULL; static const char *cp_source = NULL;
int int
@ -195,8 +195,8 @@ init_translation_table (int cpsource, int cpdisplay)
conv_input[i] = i; conv_input[i] = i;
} }
cp_display = cpsour = codepages[cpsource].id; cp_display = cpsour = (char *) codepages[cpsource].id;
cp_source = cpdisp = codepages[cpdisplay].id; cp_source = cpdisp = (char *) codepages[cpdisplay].id;
/* display <- inpit table */ /* display <- inpit table */

2
src/strutil.c
View File

@ -284,7 +284,7 @@ str_translate_char (GIConv conv, const char *keys, size_t ch_size,
left = (ch_size == (size_t) (-1)) ? strlen (keys) : ch_size; left = (ch_size == (size_t) (-1)) ? strlen (keys) : ch_size;
cnv = g_iconv (conv, &keys, &left, &output, &out_size); cnv = g_iconv (conv, (gchar **) &keys, &left, &output, &out_size);
if (cnv == (size_t)(-1)) { if (cnv == (size_t)(-1)) {
if (errno == EINVAL) return ESTR_PROBLEM; else return ESTR_FAILURE; if (errno == EINVAL) return ESTR_PROBLEM; else return ESTR_FAILURE;
} else { } else {

4
src/util.c
View File

@ -1278,7 +1278,7 @@ concat_dir_and_file (const char *dir, const char *file)
GList * GList *
list_append_unique (GList *list, char *text) list_append_unique (GList *list, char *text)
{ {
GList *link, *newlink; GList *link, *newlink, *tmp;
/* /*
* Go to the last position and traverse the list backwards * Go to the last position and traverse the list backwards
@ -1293,7 +1293,7 @@ list_append_unique (GList *list, char *text)
newlink = g_list_previous (link); newlink = g_list_previous (link);
if (!strcmp ((char *) link->data, text)) { if (!strcmp ((char *) link->data, text)) {
g_free (link->data); g_free (link->data);
g_list_remove_link (list, link); tmp = g_list_remove_link (list, link);
g_list_free_1 (link); g_list_free_1 (link);
} }
link = newlink; link = newlink;