diff options
| author | Renato Botelho <renato@netgate.com> | 2017-01-23 17:59:00 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-23 17:59:10 -0200 |
| commit | 28514a36aa4472387dd71b0fdf067532312a0649 (patch) | |
| tree | 1c02db1e94c35dd49d409ebede9b1b9926e46f95 /src/etc | |
| parent | d22617f313da52a9fc14d6f4bfb72784b4fe6004 (diff) | |
| download | pfsense-28514a36aa4472387dd71b0fdf067532312a0649.zip pfsense-28514a36aa4472387dd71b0fdf067532312a0649.tar.gz | |
Remove unused variable $cfglckkeyconsumers
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/util.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index d7094be..665806d 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -145,7 +145,7 @@ function config_unlock() { /* lock configuration file */ function lock($lock, $op = LOCK_SH) { - global $g, $cfglckkeyconsumers; + global $g; if (!$lock) { die(gettext("WARNING: A name must be given as parameter to lock() function.")); } @@ -153,7 +153,6 @@ function lock($lock, $op = LOCK_SH) { @touch("{$g['tmp_path']}/{$lock}.lock"); @chmod("{$g['tmp_path']}/{$lock}.lock", 0666); } - $cfglckkeyconsumers++; if ($fp = fopen("{$g['tmp_path']}/{$lock}.lock", "w")) { if (flock($fp, $op)) { return $fp; @@ -164,7 +163,7 @@ function lock($lock, $op = LOCK_SH) { } function try_lock($lock, $timeout = 5) { - global $g, $cfglckkeyconsumers; + global $g; if (!$lock) { die(gettext("WARNING: A name must be given as parameter to try_lock() function.")); } @@ -172,7 +171,6 @@ function try_lock($lock, $timeout = 5) { @touch("{$g['tmp_path']}/{$lock}.lock"); @chmod("{$g['tmp_path']}/{$lock}.lock", 0666); } - $cfglckkeyconsumers++; if ($fp = fopen("{$g['tmp_path']}/{$lock}.lock", "w")) { $trycounter = 0; while (!flock($fp, LOCK_EX | LOCK_NB)) { @@ -192,7 +190,7 @@ function try_lock($lock, $timeout = 5) { /* unlock configuration file */ function unlock($cfglckkey = 0) { - global $g, $cfglckkeyconsumers; + global $g; flock($cfglckkey, LOCK_UN); fclose($cfglckkey); return; |
