From 962686b67b995edab7b87ef8fba024eed24ae92d Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 3 Nov 2013 21:00:37 +0100 Subject: [PATCH] src: squelch unused variable warning |i| and |j| arent't used when building without crypto support. Hat tip to Brian White. Rename |l| to |k| while we're here because it's quite hard to discern from |i| or |j| with some fonts. --- src/node.cc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/node.cc b/src/node.cc index f6efbd0..121550e 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2261,7 +2261,6 @@ void SetupProcessObject(Environment* env, int exec_argc, const char* const* exec_argv) { HandleScope scope(node_isolate); - int i, j; Local process = env->process_object(); @@ -2311,22 +2310,25 @@ void SetupProcessObject(Environment* env, #if HAVE_OPENSSL // Stupid code to slice out the version string. - int c, l = strlen(OPENSSL_VERSION_TEXT); - for (i = j = 0; i < l; i++) { - c = OPENSSL_VERSION_TEXT[i]; - if ('0' <= c && c <= '9') { - for (j = i + 1; j < l; j++) { - c = OPENSSL_VERSION_TEXT[j]; - if (c == ' ') - break; + { + size_t i, j, k; + int c; + for (i = j = 0, k = sizeof(OPENSSL_VERSION_TEXT) - 1; i < k; ++i) { + c = OPENSSL_VERSION_TEXT[i]; + if ('0' <= c && c <= '9') { + for (j = i + 1; j < k; ++j) { + c = OPENSSL_VERSION_TEXT[j]; + if (c == ' ') + break; + } + break; } - break; } + READONLY_PROPERTY( + versions, + "openssl", + OneByteString(node_isolate, &OPENSSL_VERSION_TEXT[i], j - i)); } - READONLY_PROPERTY( - versions, - "openssl", - OneByteString(node_isolate, &OPENSSL_VERSION_TEXT[i], j - i)); #endif // process.arch -- 2.7.4