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

* editcmd.c: Introduced a type edit_getbyte_fn to get rid of

Browse Source 
the many function type casts.
This commit is contained in:
Roland Illig 2004-12-01 00:55:17 +00:00
parent d48d44dabd
commit badf915e39
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
edit/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-01 Roland Illig <roland.illig@gmx.de>
* editcmd.c: Introduced a type edit_getbyte_fn to get rid of
the many function type casts.
2004-11-18 Andrew V. Samoilov <andrew@email.zp.ua> 2004-11-18 Andrew V. Samoilov <andrew@email.zp.ua>
* syntax.c (get_args): Use in "args_size" argument instead of * syntax.c (get_args): Use in "args_size" argument instead of

17
edit/editcmd.c
View File

@ -1412,8 +1412,10 @@ string_regexp_search (char *pattern, char *string, int len, int match_type,
/* thanks to Liviu Daia <daia@stoilow.imar.ro> for getting this /* thanks to Liviu Daia <daia@stoilow.imar.ro> for getting this
(and the above) routines to work properly - paul */ (and the above) routines to work properly - paul */
typedef int (*edit_getbyte_fn) (WEdit *, long);
static long static long
edit_find_string (long start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, int once_only, void *d) edit_find_string (long start, unsigned char *exp, int *len, long last_byte, edit_getbyte_fn get_byte, void *data, int once_only, void *d)
{ {
long p, q = 0; long p, q = 0;
long l = strlen ((char *) exp), f = 0; long l = strlen ((char *) exp), f = 0;
@ -1571,7 +1573,7 @@ edit_find_string (long start, unsigned char *exp, int *len, long last_byte, int
static long static long
edit_find_forwards (long search_start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, int once_only, void *d) edit_find_forwards (long search_start, unsigned char *exp, int *len, long last_byte, edit_getbyte_fn get_byte, void *data, int once_only, void *d)
{ /*front end to find_string to check for { /*front end to find_string to check for
whole words */ whole words */
long p; long p;
@ -1595,7 +1597,7 @@ edit_find_forwards (long search_start, unsigned char *exp, int *len, long last_b
} }
static long static long
edit_find (long search_start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, void *d) edit_find (long search_start, unsigned char *exp, int *len, long last_byte, edit_getbyte_fn get_byte, void *data, void *d)
{ {
long p; long p;
if (replace_backwards) { if (replace_backwards) {
@ -1843,8 +1845,7 @@ edit_replace_cmd (WEdit *edit, int again)
long new_start; long new_start;
new_start = new_start =
edit_find (edit->search_start, (unsigned char *) exp1, &len, edit_find (edit->search_start, (unsigned char *) exp1, &len,
last_search, (int (*)(void *, long)) edit_get_byte, last_search, edit_get_byte, (void *) edit, pmatch);
(void *) edit, pmatch);
if (new_start == -3) { if (new_start == -3) {
regexp_error (edit); regexp_error (edit);
break; break;
@ -2040,7 +2041,7 @@ void edit_search_cmd (WEdit * edit, int again)
long p, q = 0; long p, q = 0;
for (;;) { for (;;) {
p = edit_find (q, (unsigned char *) exp, &len, edit->last_byte, p = edit_find (q, (unsigned char *) exp, &len, edit->last_byte,
(int (*)(void *, long)) edit_get_byte, (void *) edit, 0); edit_get_byte, (void *) edit, 0);
if (p < 0) if (p < 0)
break; break;
found++; found++;
@ -2067,7 +2068,7 @@ void edit_search_cmd (WEdit * edit, int again)
edit->search_start++; edit->search_start++;
edit->search_start = edit_find (edit->search_start, (unsigned char *) exp, &len, edit->last_byte, edit->search_start = edit_find (edit->search_start, (unsigned char *) exp, &len, edit->last_byte,
(int (*)(void *, long)) edit_get_byte, (void *) edit, 0); edit_get_byte, (void *) edit, 0);
if (edit->search_start >= 0) { if (edit->search_start >= 0) {
edit->found_start = edit->search_start; edit->found_start = edit->search_start;
@ -2696,7 +2697,7 @@ edit_collect_completions (WEdit *edit, long start, int word_len,
start = start =
edit_find (start - 1, (unsigned char *) match_expr, &len, edit_find (start - 1, (unsigned char *) match_expr, &len,
edit->last_byte, edit->last_byte,
(int (*)(void *, long)) edit_get_byte, edit_get_byte,
(void *) edit, 0); (void *) edit, 0);
/* not matched */ /* not matched */