mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

address -Wshaddow of lockfile

Browse Source
This commit is contained in:
Mark Andrews
2015-03-04 13:49:48 +11:00
parent 947d37484e
commit d869bc7685
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/named/unix/os.c
View File

@@ -872,7 +872,7 @@ ns_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user) {
void void
ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
FILE *lockfile; FILE *fh;
pid_t pid; pid_t pid;
char strbuf[ISC_STRERRORSIZE]; char strbuf[ISC_STRERRORSIZE];
void (*report)(const char *, ...); void (*report)(const char *, ...);
@@ -895,9 +895,9 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
return; return;
} }
lockfile = ns_os_openfile(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, fh = ns_os_openfile(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH,
first_time); first_time);
if (lockfile == NULL) { if (fh == NULL) {
cleanup_pidfile(); cleanup_pidfile();
return; return;
} }
@@ -906,19 +906,19 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
#else #else
pid = getpid(); pid = getpid();
#endif #endif
if (fprintf(lockfile, "%ld\n", (long)pid) < 0) { if (fprintf(fh, "%ld\n", (long)pid) < 0) {
(*report)("fprintf() to pid file '%s' failed", filename); (*report)("fprintf() to pid file '%s' failed", filename);
(void)fclose(lockfile); (void)fclose(fh);
cleanup_pidfile(); cleanup_pidfile();
return; return;
} }
if (fflush(lockfile) == EOF) { if (fflush(fh) == EOF) {
(*report)("fflush() to pid file '%s' failed", filename); (*report)("fflush() to pid file '%s' failed", filename);
(void)fclose(lockfile); (void)fclose(fh);
cleanup_pidfile(); cleanup_pidfile();
return; return;
} }
(void)fclose(lockfile); (void)fclose(fh);
} }
isc_boolean_t isc_boolean_t