dilim/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-08-08 09:01:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SV 60699] Avoid calling strlen() repeatedly in a loop

Browse Source 
* src/variable.c (lookup_pattern_var): Accept target length parameter.
(initialize_file_variables): Pass computed target length to lookup.
This commit is contained in:
Dmitry Goncharov
2021-05-30 16:21:22 -04:00
committed by Paul Smith
parent 2d73c9bf25
commit 65b73ce434
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/variable.c
View File

@@ -98,10 +98,10 @@ create_pattern_var (const char *target, const char *suffix)
/* Look up a target in the pattern-specific variable list. */
static struct pattern_var *
lookup_pattern_var (struct pattern_var *start, const char *target)
lookup_pattern_var (struct pattern_var *start, const char *target,
size_t targlen)
{
struct pattern_var *p;
size_t targlen = strlen (target);
for (p = start ? start->next : pattern_vars; p != 0; p = p->next)
{
@@ -604,8 +604,9 @@ initialize_file_variables (struct file *file, int reading)
if (!reading && !file->pat_searched)
{
struct pattern_var *p;
const size_t targlen = strlen (file->name);
p = lookup_pattern_var (0, file->name);
p = lookup_pattern_var (0, file->name, targlen);
if (p != 0)
{
struct variable_set_list *global = current_variable_set_list;
@@ -644,7 +645,7 @@ initialize_file_variables (struct file *file, int reading)
v->export = p->variable.export;
v->private_var = p->variable.private_var;
}
while ((p = lookup_pattern_var (p, file->name)) != 0);
while ((p = lookup_pattern_var (p, file->name, targlen)) != 0);
current_variable_set_list = global;
}