mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

* edit.c: Use g_malloc() and g_free() on buffers1 and buffers2.

Browse Source 
Eliminate CMalloc.
(edit_get_buffer_as_text): Remove, it's unused.
This commit is contained in:
Pavel Roskin 2002-11-30 17:53:12 +00:00
parent 29f1543919
commit 41fbb5099f
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edit/ChangeLog
View File

@ -1,5 +1,9 @@
2002-11-30 Pavel Roskin <proski@gnu.org>
* edit.c: Use g_malloc() and g_free() on buffers1 and buffers2.
Eliminate CMalloc.
(edit_get_buffer_as_text): Remove, it's unused.
* editcmd.c (edit_set_search_parameters): Use g_malloc().
(edit_complete_word_cmd): Use g_free().

34
edit/edit.c
View File

@ -124,18 +124,6 @@ int edit_get_byte (WEdit * edit, long byte_index)
#endif
char *edit_get_buffer_as_text (WEdit * e)
{
int l, i;
char *t;
l = e->curs1 + e->curs2;
t = CMalloc (l + 1);
for (i = 0; i < l; i++)
t[i] = edit_get_byte (e, i);
t[l] = 0;
return t;
}
/*
The edit_open_file (previously edit_load_file) function uses
@ -175,7 +163,7 @@ init_dynamic_edit_buffers (WEdit * edit, const char *filename, const char *text)
buf2 = edit->curs2 >> S_EDIT_BUF_SIZE;
edit->buffers2[buf2] = CMalloc (EDIT_BUF_SIZE);
edit->buffers2[buf2] = g_malloc (EDIT_BUF_SIZE);
if (filename) {
mc_read (file, (char *) edit->buffers2[buf2] + EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE), edit->curs2 & M_EDIT_BUF_SIZE);
@ -185,7 +173,7 @@ init_dynamic_edit_buffers (WEdit * edit, const char *filename, const char *text)
}
for (buf = buf2 - 1; buf >= 0; buf--) {
edit->buffers2[buf] = CMalloc (EDIT_BUF_SIZE);
edit->buffers2[buf] = g_malloc (EDIT_BUF_SIZE);
if (filename) {
mc_read (file, (char *) edit->buffers2[buf], EDIT_BUF_SIZE);
} else {
@ -312,13 +300,13 @@ int edit_insert_file (WEdit * edit, const char *filename)
unsigned char *buf;
if ((file = mc_open (filename, O_RDONLY | O_BINARY )) == -1)
return 0;
buf = malloc (TEMP_BUF_LEN);
buf = g_malloc (TEMP_BUF_LEN);
while ((blocklen = mc_read (file, (char *) buf, TEMP_BUF_LEN)) > 0) {
for (i = 0; i < blocklen; i++)
edit_insert (edit, buf[i]);
}
edit_cursor_move (edit, current - edit->curs1);
free (buf);
g_free (buf);
mc_close (file);
if (blocklen)
return 0;
@ -509,9 +497,9 @@ int edit_clean (WEdit * edit)
book_mark_flush (edit, -1);
for (; j <= MAXBUFF; j++) {
if (edit->buffers1[j] != NULL)
free (edit->buffers1[j]);
g_free (edit->buffers1[j]);
if (edit->buffers2[j] != NULL)
free (edit->buffers2[j]);
g_free (edit->buffers2[j]);
}
if (edit->undo_stack)
@ -820,7 +808,7 @@ void edit_insert_ahead (WEdit * edit, int c)
edit->last_get_rule += (edit->last_get_rule >= edit->curs1);
if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
edit->buffers2[(edit->curs2 + 1) >> S_EDIT_BUF_SIZE] = malloc (EDIT_BUF_SIZE);
edit->buffers2[(edit->curs2 + 1) >> S_EDIT_BUF_SIZE] = g_malloc (EDIT_BUF_SIZE);
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
edit->last_byte++;
@ -841,7 +829,7 @@ int edit_delete (WEdit * edit)
p = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1];
if (!(edit->curs2 & M_EDIT_BUF_SIZE)) {
free (edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE]);
g_free (edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE]);
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = NULL;
}
edit->last_byte--;
@ -878,7 +866,7 @@ edit_backspace (WEdit * edit)
p = *(edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE] + ((edit->curs1 - 1) & M_EDIT_BUF_SIZE));
if (!((edit->curs1 - 1) & M_EDIT_BUF_SIZE)) {
free (edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE]);
g_free (edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE]);
edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] = NULL;
}
edit->last_byte--;
@ -1028,7 +1016,7 @@ int edit_cursor_move (WEdit * edit, long increment)
edit->curs2++;
c = edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE][(edit->curs1 - 1) & M_EDIT_BUF_SIZE];
if (!((edit->curs1 - 1) & M_EDIT_BUF_SIZE)) {
free (edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE]);
g_free (edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE]);
edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] = NULL;
}
edit->curs1--;
@ -1053,7 +1041,7 @@ int edit_cursor_move (WEdit * edit, long increment)
edit->curs1++;
c = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1];
if (!(edit->curs2 & M_EDIT_BUF_SIZE)) {
free (edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE]);
g_free (edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE]);
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = 0;
}
edit->curs2--;

2
edit/edit.h
View File

@ -178,7 +178,6 @@ static inline int edit_get_byte (WEdit * edit, long byte_index)
}
#endif
char *edit_get_buffer_as_text (WEdit * edit);
int edit_count_lines (WEdit * edit, long current, int upto);
long edit_move_forward (WEdit * edit, long current, int lines, long upto);
long edit_move_forward3 (WEdit * edit, long current, int cols, long upto);
@ -305,7 +304,6 @@ int edit_execute_cmd (WEdit * edit, int command, int char_for_insertion);
#define edit_get_load_file(d,f,h) input_dialog (h, _(" Enter file name: "), f)
#define edit_get_save_file(d,f,h) input_dialog (h, _(" Enter file name: "), f)
#define CMalloc(x) malloc(x)
#define edit_error_dialog(h,s) query_dialog (h, s, 0, 1, _("&Dismiss"))