From d157605c05fc05aa2ed5ffcc51ed70cbef20f8aa Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Mon, 8 Dec 2014 21:16:51 -0800
Subject: [PATCH] Bug 1108932 - Fix -Wunused-const-variable warning-as-error in
 nsCSPParser.cpp. r=ckerschb

---
 dom/security/nsCSPParser.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/dom/security/nsCSPParser.cpp b/dom/security/nsCSPParser.cpp
index 47d2123b19f9..d205cca4655b 100644
--- a/dom/security/nsCSPParser.cpp
+++ b/dom/security/nsCSPParser.cpp
@@ -51,13 +51,12 @@ static const char16_t DOLLAR       = '$';
 static const char16_t AMPERSAND    = '&';
 static const char16_t OPENBRACE    = '(';
 static const char16_t CLOSINGBRACE = ')';
-static const char16_t COMMA        = ',';
 static const char16_t EQUALS       = '=';
 static const char16_t ATSYMBOL     = '@';
 
-static uint32_t kSubHostPathCharacterCutoff = 512;
+static const uint32_t kSubHostPathCharacterCutoff = 512;
 
-static const char* kHashSourceValidFns [] = { "sha256", "sha384", "sha512" };
+static const char *const kHashSourceValidFns [] = { "sha256", "sha384", "sha512" };
 static const uint32_t kHashSourceValidFnsLen = 3;
 
 /* ===== nsCSPTokenizer ==================== */
@@ -135,21 +134,20 @@ nsCSPParser::~nsCSPParser()
   CSPPARSERLOG(("nsCSPParser::~nsCSPParser"));
 }
 
-
-bool
+static bool
 isCharacterToken(char16_t aSymbol)
 {
   return (aSymbol >= 'a' && aSymbol <= 'z') ||
          (aSymbol >= 'A' && aSymbol <= 'Z');
 }
 
-bool
+static bool
 isNumberToken(char16_t aSymbol)
 {
   return (aSymbol >= '0' && aSymbol <= '9');
 }
 
-bool
+static bool
 isValidHexDig(char16_t aHexDig)
 {
   return (isNumberToken(aHexDig) ||
@@ -690,7 +688,6 @@ nsCSPParser::hashSource()
                NS_ConvertUTF16toUTF8(mCurToken).get(),
                NS_ConvertUTF16toUTF8(mCurValue).get()));
 
-
   // Check if mCurToken starts and ends with "'"
   if (mCurToken.First() != SINGLEQUOTE ||
       mCurToken.Last() != SINGLEQUOTE) {