shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

lvmlockd: clean up get_local_nodeid

Browse Source 
Hard to see if fclose calls were correct, and coverity couldn't figure
it out either, so make it clear.
This commit is contained in:
David Teigland 2023-03-08 11:11:32 -06:00
parent cd14d3fcc0
commit da44f2b6fe
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
daemons/lvmlockd/lvmlockd-dlm.c
View File

@ -227,8 +227,9 @@ static int get_local_nodeid(void)
struct dirent *de; struct dirent *de;
DIR *ls_dir; DIR *ls_dir;
char ls_comms_path[PATH_MAX]; char ls_comms_path[PATH_MAX];
FILE *file = NULL; FILE *file;
char line[LOCK_LINE_MAX]; char line[LOCK_LINE_MAX];
char *str1, *str2;
int rv = -1, val; int rv = -1, val;
memset(ls_comms_path, 0, sizeof(ls_comms_path)); memset(ls_comms_path, 0, sizeof(ls_comms_path));
@ -243,30 +244,33 @@ static int get_local_nodeid(void)
memset(ls_comms_path, 0, sizeof(ls_comms_path)); memset(ls_comms_path, 0, sizeof(ls_comms_path));
snprintf(ls_comms_path, PATH_MAX, "%s/%s/local", snprintf(ls_comms_path, PATH_MAX, "%s/%s/local",
DLM_COMMS_PATH, de->d_name); DLM_COMMS_PATH, de->d_name);
file = fopen(ls_comms_path, "r");
if (!file) if (!(file = fopen(ls_comms_path, "r")))
continue; continue;
if (fgets(line, LOCK_LINE_MAX, file)) { str1 = fgets(line, LOCK_LINE_MAX, file);
fclose(file); fclose(file);
if (str1) {
rv = sscanf(line, "%d", &val); rv = sscanf(line, "%d", &val);
if ((rv == 1) && (val == 1 )) { if ((rv == 1) && (val == 1 )) {
memset(ls_comms_path, 0, sizeof(ls_comms_path)); memset(ls_comms_path, 0, sizeof(ls_comms_path));
snprintf(ls_comms_path, PATH_MAX, "%s/%s/nodeid", snprintf(ls_comms_path, PATH_MAX, "%s/%s/nodeid",
DLM_COMMS_PATH, de->d_name); DLM_COMMS_PATH, de->d_name);
file = fopen(ls_comms_path, "r");
if (!file) if (!(file = fopen(ls_comms_path, "r")))
continue; continue;
if (fgets(line, LOCK_LINE_MAX, file)) { str2 = fgets(line, LOCK_LINE_MAX, file);
fclose(file);
if (str2) {
rv = sscanf(line, "%d", &val); rv = sscanf(line, "%d", &val);
if (rv == 1) { if (rv == 1) {
fclose(file);
closedir(ls_dir); closedir(ls_dir);
return val; return val;
} }
} }
} }
} }
fclose(file);
} }
if (closedir(ls_dir)) if (closedir(ls_dir))