From: Shawn Routhier <sar@isc.org>
Date: Thu, 14 Apr 2016 21:24:16 +0000 (+0000)
Subject: [trac4269] Updates per review comments, basically change some variable names
X-Git-Tag: trac4106_update_base~43^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7549535b3a868a63ea1adc220daca28efff0e971;p=thirdparty%2Fkea.git

[trac4269] Updates per review comments, basically change some variable names
---

diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index 446fba2236..009fe69348 100644
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -763,8 +763,8 @@ namespace isc { namespace eval {
   case 16:
 #line 182 "parser.yy" // lalr1.cc:859
     {
-                      TokenPtr pkt6field(new TokenPkt6(yystack_[0].value.as< TokenPkt6::FieldType > ()));
-                      ctx.expression.push_back(pkt6field);
+                      TokenPtr pkt6_field(new TokenPkt6(yystack_[0].value.as< TokenPkt6::FieldType > ()));
+                      ctx.expression.push_back(pkt6_field);
                   }
 #line 770 "parser.cc" // lalr1.cc:859
     break;
diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index ac8a1334a5..67d190b6c0 100644
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -180,8 +180,8 @@ string_expr : STRING
                   }
             | PKT6 "." pkt6_field
                   {
-                      TokenPtr pkt6field(new TokenPkt6($3));
-                      ctx.expression.push_back(pkt6field);
+                      TokenPtr pkt6_field(new TokenPkt6($3));
+                      ctx.expression.push_back(pkt6_field);
                   }
             ;
 
diff --git a/src/lib/eval/tests/context_unittest.cc b/src/lib/eval/tests/context_unittest.cc
index 72c25adff4..e4ae0c3dcd 100644
--- a/src/lib/eval/tests/context_unittest.cc
+++ b/src/lib/eval/tests/context_unittest.cc
@@ -125,8 +125,9 @@ public:
 
     /// @brief checks if the given token is Pkt6 of specified type
     /// @param token token to be checked
-    /// @param type expected type of the Pkt6 field
-    void checkTokenPkt6(const TokenPtr& token, TokenPkt6::FieldType type) {
+    /// @param exp_type expected type of the Pkt6 field
+    void checkTokenPkt6(const TokenPtr& token,
+                        TokenPkt6::FieldType exp_type) {
         ASSERT_TRUE(token);
 
         boost::shared_ptr<TokenPkt6> pkt =
@@ -134,7 +135,7 @@ public:
 
         ASSERT_TRUE(pkt);
 
-        EXPECT_EQ(type, pkt->getType());
+        EXPECT_EQ(exp_type, pkt->getType());
     }
 
     /// @brief checks if the given expression raises the expected message