RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: server: Remove useless "filepath" variable in apply_server_state() 

This variable is now only used to point on the local server-state file. When
the server-state is global, it is unused. So, we now use "localfilepath"
instead. Thus, the "filepath" variable can safely be removed.
This commit is contained in:
Christopher Faulet 2021-02-12 16:38:14 +01:00
parent 8952ea636b
commit 469676423e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.c
View File

@ -3186,7 +3186,6 @@ void apply_server_state(void)
char *srv_params[SRV_STATE_FILE_MAX_FIELDS] = {0};
int version, global_file_version;
FILE *f;
char *filepath;
char globalfilepath[MAXPATHLEN + 1];
char localfilepath[MAXPATHLEN + 1];
int len, fileopenerr, globalfilepathlen, localfilepathlen;
@ -3314,7 +3313,6 @@ void apply_server_state(void)
if (!(curproxy->cap & PR_CAP_BE))
continue;
fileopenerr = 0;
filepath = NULL;
/* search server state file path and name */
switch (curproxy->load_server_state_from_file) {
@ -3323,7 +3321,6 @@ void apply_server_state(void)
/* there was an error while generating global server state file path */
if (globalfilepathlen == 0)
continue;
filepath = globalfilepath;
fileopenerr = 1;
break;
/* this backend has its own file */
@ -3375,7 +3372,6 @@ void apply_server_state(void)
localfileerror:
if (localfilepathlen == 0)
continue;
filepath = localfilepath;
break;
case PR_SRV_STATE_FILE_NONE:
@ -3418,9 +3414,9 @@ void apply_server_state(void)
else {
/* load 'local' state file */
errno = 0;
f = fopen(filepath, "r");
f = fopen(localfilepath, "r");
if (errno && fileopenerr)
ha_warning("Can't open server state file '%s': %s\n", filepath, strerror(errno));
ha_warning("Can't open server state file '%s': %s\n", localfilepath, strerror(errno));
if (!f)
continue;
@ -3429,7 +3425,7 @@ void apply_server_state(void)
/* first character of first line of the file must contain the version of the export */
version = srv_state_get_version(f);
if (version == 0) {
ha_warning("Can't get version of the server state file '%s'\n", filepath);
ha_warning("Can't get version of the server state file '%s'\n", localfilepath);
goto fileclose;
}