From 5db732d677970ce3f0ec8cdb369a7cf956cc9afa Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 29 Jan 2019 14:47:24 +0000 Subject: [PATCH] capture-libs: Avoid shadowing global abs() In Ubuntu 12.04, this is declared in a header that we include. Signed-off-by: Simon McVittie <smcv@collabora.com> --- utils/capture-libs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/capture-libs.c b/utils/capture-libs.c index 33668cc28..54011cb5b 100644 --- a/utils/capture-libs.c +++ b/utils/capture-libs.c @@ -643,7 +643,7 @@ static bool capture_path_match( const char *pattern, capture_flags flags, int *code, char **message ) { - char *abs = NULL; + char *abs_path = NULL; int res; bool ret = false; glob_t buffer; @@ -651,8 +651,8 @@ capture_path_match( const char *pattern, capture_flags flags, DEBUG( DEBUG_TOOL, "%s", pattern ); - abs = build_filename_alloc( option_provider, pattern, NULL ); - res = glob( abs, 0, NULL, &buffer ); + abs_path = build_filename_alloc( option_provider, pattern, NULL ); + res = glob( abs_path, 0, NULL, &buffer ); switch( res ) { @@ -715,7 +715,7 @@ capture_path_match( const char *pattern, capture_flags flags, break; } - free( abs ); + free( abs_path ); return ret; } -- GitLab