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

(subst_defines): refactoring.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-02-15 09:58:24 +03:00
parent 6b67d123d9
commit 4d219ec5c1
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/editor/syntax.c
View File

@ -204,26 +204,23 @@ xx_tolower (const WEdit * edit, int c)
static void
subst_defines (GTree * defines, char **argv, char **argv_end)
{
char **t, **p;
int argc;
while (*argv != NULL && argv < argv_end)
for (; *argv != NULL && argv < argv_end; argv++)
{
char **t;
t = g_tree_lookup (defines, *argv);
if (t != NULL)
{
int count = 0;
int argc, count;
char **p;
/* Count argv array members */
argc = 0;
for (p = &argv[1]; *p != NULL; p++)
argc++;
argc = g_strv_length (argv + 1);
/* Count members of definition array */
for (p = t; *p != NULL; p++)
count++;
p = &argv[count + argc];
count = g_strv_length (t);
p = argv + count + argc;
/* Buffer overflow or infinitive loop in define */
if (p >= argv_end)
break;
@ -236,7 +233,6 @@ subst_defines (GTree * defines, char **argv, char **argv_end)
for (p = argv; *t != NULL; *p++ = *t++)
;
}
argv++;
}
}