summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/util.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-01-23 17:59:00 -0200
committerRenato Botelho <renato@netgate.com>2017-01-23 17:59:07 -0200
commit42ea8f9afb6cad62cad6a1b448d18063667a4744 (patch)
treeae0b4d3791b7d4e8c6837c07c02c7be391c9e69e /src/etc/inc/util.inc
parent278eb7de6a777c30b2400de95841c4e024b9ae04 (diff)
downloadpfsense-42ea8f9afb6cad62cad6a1b448d18063667a4744.zip
pfsense-42ea8f9afb6cad62cad6a1b448d18063667a4744.tar.gz
Remove unused variable $cfglckkeyconsumers
Diffstat (limited to 'src/etc/inc/util.inc')
-rw-r--r--src/etc/inc/util.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index 2176423..38df3af 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -114,7 +114,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."));
}
@@ -122,7 +122,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;
@@ -133,7 +132,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."));
}
@@ -141,7 +140,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)) {
@@ -161,7 +159,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;
OpenPOWER on IntegriCloud