From 440cb37c740a4dcf459cd772e18b0d2a67df10cb Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 17 Oct 2018 13:25:11 -0500 Subject: [PATCH] libfrog: change project entity variable scope to local/static. The project quota code used a global variable "p" for getprent() and getprpathent(), presumably to keep the interface analogous to getpwent() etc. However, other functions had their own local "p" which led to shadow variable warnings from sparse. Rather than a global, make it a static variable within the project functions. Same behavior, same interface, less confusion, and retains an interface similar that of getpwent etc. Signed-off-by: Eric Sandeen Reviewed-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- libfrog/projects.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libfrog/projects.c b/libfrog/projects.c index d4dda3f73..91bc78f24 100644 --- a/libfrog/projects.c +++ b/libfrog/projects.c @@ -15,12 +15,8 @@ char *projid_file; char *projects_file; static FILE *projects; -static fs_project_t p; -static char projects_buffer[512]; static FILE *project_paths; -static fs_project_path_t pp; -static char project_paths_buffer[1024]; void setprfiles(void) @@ -64,8 +60,10 @@ endprpathent(void) fs_project_t * getprent(void) { - char *idstart, *idend; - size_t size = sizeof(projects_buffer) - 1; + static fs_project_t p; + static char projects_buffer[512]; + char *idstart, *idend; + size_t size = sizeof(projects_buffer) - 1; if (!projects) return NULL; @@ -125,6 +123,8 @@ getprprid( fs_project_path_t * getprpathent(void) { + static fs_project_path_t pp; + static char project_paths_buffer[1024]; char *nmstart, *nmend; size_t size = sizeof(project_paths_buffer) - 1; -- 2.39.2