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

(regex_command_for): minor optimisation.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-01-04 08:23:24 +03:00
parent 391821e4ab
commit 0e1dfbf2b9
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/filemanager/ext.c
View File

@ -776,9 +776,9 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
gboolean error_flag = FALSE;
int ret = 0;
struct stat mystat;
int view_at_line_number;
char *include_target;
int include_target_len;
int view_at_line_number = 0;
char *include_target = NULL;
size_t include_target_len = 0;
gboolean have_type = FALSE; /* Flag used by regex_check_type() */
if (filename_vpath == NULL)
@ -793,10 +793,6 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
view_at_line_number = atoi (action + 5);
action = "View";
}
else
{
view_at_line_number = 0;
}
if (data == NULL)
{
@ -869,9 +865,6 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
mc_stat (filename_vpath, &mystat);
include_target = NULL;
include_target_len = 0;
filename = vfs_path_get_last_path_str (filename_vpath);
filename = x_basename (filename);
file_len = strlen (filename);
@ -890,9 +883,8 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
if (*p == '\0')
break;
if (p == q)
{ /* i.e. starts in the first column, should be
* keyword/descNL
*/
{
/* i.e. starts in the first column, should be keyword/descNL */
gboolean case_insense;
found = FALSE;
@ -901,7 +893,7 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
q = strchr (p, '\0');
c = *q;
*q = '\0';
if (include_target)
if (include_target != NULL)
{
if ((strncmp (p, "include/", 8) == 0)
&& (strncmp (p + 8, include_target, include_target_len) == 0))
@ -973,9 +965,6 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
found = TRUE;
*q = c;
p = q;
if (*p == '\0')
break;
}
else
{ /* List of actions */
@ -996,11 +985,11 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
include_target = p + 8;
t = strchr (include_target, '\n');
if (t != NULL)
*t = '\0';
include_target_len = strlen (include_target);
if (t != NULL)
*t = '\n';
include_target_len = (size_t) (t - include_target);
else
include_target_len = strlen (include_target);
*r = c;
p = q;
@ -1040,14 +1029,14 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
}
}
}
p = q;
if (*p == '\0')
break;
}
p = q;
if (*p == '\0')
break;
}
if (error_flag)
ret = -1;
return ret;
return (error_flag ? -1 : ret);
}
/* --------------------------------------------------------------------------------------------- */