A coming change adds _get/_put abstraction on the site pointer, to
allow managing site info more flexibly.  The get/put pattern is best
done at a single lexical scope, where its more obviously correct, so
hoist the ->site ref out of ddebug_match_site, and pass it in instead.

no functional changes

Signed-off-by: Jim Cromie <jim.cro...@gmail.com>
---
 lib/dynamic_debug.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index da732e0c56e3..abe3382aabd5 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -143,10 +143,9 @@ static void vpr_info_dq(const struct ddebug_query *query, 
const char *msg)
 }
 
 static int ddebug_match_site(const struct ddebug_query *query,
-                            const struct _ddebug *dp)
+                            const struct _ddebug *dp,
+                            const struct _ddebug_site *dc)
 {
-       struct _ddebug_site *dc;
-
        /* match against the format */
        if (query->format) {
                if (*query->format == '^') {
@@ -167,7 +166,6 @@ static int ddebug_match_site(const struct ddebug_query 
*query,
            dp->lineno > query->last_lineno)
                return false;
 
-       dc = dp->site;
        if (!dc) {
                /* site info has been dropped, so query cannot test these 
fields */
                if (query->filename || query->function)
@@ -219,9 +217,9 @@ static int ddebug_change(const struct ddebug_query *query,
 
                for (i = 0; i < dt->num_ddebugs; i++) {
                        struct _ddebug *dp = &dt->ddebugs[i];
-                       struct _ddebug_site *dc;
+                       struct _ddebug_site *dc = dp->site;
 
-                       if (!ddebug_match_site(query, dp))
+                       if (!ddebug_match_site(query, dp, dc))
                                continue;
 
                        nfound++;
-- 
2.29.2

Reply via email to