summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Beurdouche <benjamin.beurdouche@inria.fr>2021-02-24 16:09:46 +0000
committerBenjamin Beurdouche <benjamin.beurdouche@inria.fr>2021-02-24 16:09:46 +0000
commit38a53cd99ea7a92e8bcd237f1faa1b8a48921234 (patch)
tree11c7d3ae9e307325ab74197aac9509b43751ed24
parent683516508b55f93f6cbd0dc4357c47434ed6cd30 (diff)
downloadnss-hg-38a53cd99ea7a92e8bcd237f1faa1b8a48921234.tar.gz
Bug 1685880 - Minor fix to prevent unused variable on early return. r=beurdouche
Depends on D104418 Differential Revision: https://phabricator.services.mozilla.com/D106144
-rw-r--r--lib/util/secport.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/util/secport.c b/lib/util/secport.c
index 7126492fc..c1f0344b1 100644
--- a/lib/util/secport.c
+++ b/lib/util/secport.c
@@ -730,8 +730,6 @@ int
NSS_PutEnv(const char *envVarName, const char *envValue)
{
SECStatus result = SECSuccess;
- char *encoded;
- int putEnvFailed;
#ifdef _WIN32
PRBool setOK;
@@ -748,14 +746,14 @@ NSS_PutEnv(const char *envVarName, const char *envValue)
return SECFailure;
}
#else
- encoded = (char *)PORT_ZAlloc(strlen(envVarName) + 2 + strlen(envValue));
+ char *encoded = (char *)PORT_ZAlloc(strlen(envVarName) + 2 + strlen(envValue));
if (!encoded) {
return SECFailure;
}
strcpy(encoded, envVarName);
strcat(encoded, "=");
strcat(encoded, envValue);
- putEnvFailed = putenv(encoded); /* adopt. */
+ int putEnvFailed = putenv(encoded); /* adopt. */
if (putEnvFailed) {
SET_ERROR_CODE