[07/27] lib: fwts_log_scan: rename function argument to avoid name shadowing
diff mbox series

Message ID 20180815131129.24146-8-colin.king@canonical.com
State Accepted
Headers show
Series
  • [01/27] lib: fwts_framework: ensure src pointer is const
Related show

Commit Message

Colin King Aug. 15, 2018, 1:11 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

The argument fwts_log_scan_patterns to function fwts_log_check is
shadowing the global function of the same name.  Rename the function
argument to avoid name shadowing confusion.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/lib/src/fwts_log_scan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Alex Hung Aug. 15, 2018, 5:55 p.m. UTC | #1
On 2018-08-15 06:11 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The argument fwts_log_scan_patterns to function fwts_log_check is
> shadowing the global function of the same name.  Rename the function
> argument to avoid name shadowing confusion.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/lib/src/fwts_log_scan.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/lib/src/fwts_log_scan.c b/src/lib/src/fwts_log_scan.c
> index 9a2f0f95..2a2460e2 100644
> --- a/src/lib/src/fwts_log_scan.c
> +++ b/src/lib/src/fwts_log_scan.c
> @@ -349,7 +349,7 @@ nullobj:
>   
>   int fwts_log_check(fwts_framework *fw,
>           const char *table,
> -        fwts_log_scan_func fwts_log_scan_patterns,
> +        fwts_log_scan_func fwts_log_scan_patterns_func,
>           fwts_log_progress_func progress,
>           fwts_list *log,
>           int *errors,
> @@ -450,7 +450,7 @@ int fwts_log_check(fwts_framework *fw,
>                   }
>           }
>           /* We've now collected up the scan patterns, lets scan the log for errors */
> -        ret = fwts_log_scan(fw, log, fwts_log_scan_patterns, progress, patterns, errors, remove_timestamp);
> +        ret = fwts_log_scan(fw, log, fwts_log_scan_patterns_func, progress, patterns, errors, remove_timestamp);
>   
>   fail:
>           for (i = 0; i < n; i++) {
> 

Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu Aug. 16, 2018, 9:13 a.m. UTC | #2
On 08/15/2018 09:11 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The argument fwts_log_scan_patterns to function fwts_log_check is
> shadowing the global function of the same name.  Rename the function
> argument to avoid name shadowing confusion.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/lib/src/fwts_log_scan.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/lib/src/fwts_log_scan.c b/src/lib/src/fwts_log_scan.c
> index 9a2f0f95..2a2460e2 100644
> --- a/src/lib/src/fwts_log_scan.c
> +++ b/src/lib/src/fwts_log_scan.c
> @@ -349,7 +349,7 @@ nullobj:
>  
>  int fwts_log_check(fwts_framework *fw,
>          const char *table,
> -        fwts_log_scan_func fwts_log_scan_patterns,
> +        fwts_log_scan_func fwts_log_scan_patterns_func,
>          fwts_log_progress_func progress,
>          fwts_list *log,
>          int *errors,
> @@ -450,7 +450,7 @@ int fwts_log_check(fwts_framework *fw,
>                  }
>          }
>          /* We've now collected up the scan patterns, lets scan the log for errors */
> -        ret = fwts_log_scan(fw, log, fwts_log_scan_patterns, progress, patterns, errors, remove_timestamp);
> +        ret = fwts_log_scan(fw, log, fwts_log_scan_patterns_func, progress, patterns, errors, remove_timestamp);
>  
>  fail:
>          for (i = 0; i < n; i++) {

Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch
diff mbox series

diff --git a/src/lib/src/fwts_log_scan.c b/src/lib/src/fwts_log_scan.c
index 9a2f0f95..2a2460e2 100644
--- a/src/lib/src/fwts_log_scan.c
+++ b/src/lib/src/fwts_log_scan.c
@@ -349,7 +349,7 @@  nullobj:
 
 int fwts_log_check(fwts_framework *fw,
         const char *table,
-        fwts_log_scan_func fwts_log_scan_patterns,
+        fwts_log_scan_func fwts_log_scan_patterns_func,
         fwts_log_progress_func progress,
         fwts_list *log,
         int *errors,
@@ -450,7 +450,7 @@  int fwts_log_check(fwts_framework *fw,
                 }
         }
         /* We've now collected up the scan patterns, lets scan the log for errors */
-        ret = fwts_log_scan(fw, log, fwts_log_scan_patterns, progress, patterns, errors, remove_timestamp);
+        ret = fwts_log_scan(fw, log, fwts_log_scan_patterns_func, progress, patterns, errors, remove_timestamp);
 
 fail:
         for (i = 0; i < n; i++) {