[2369] Use prefix syntax for increment/decrement operators

diff --git a/src/lib/dns/master_lexer_inputsource.cc b/src/lib/dns/master_lexer_inputsource.cc
index 5d8d41343bc2b26b91a6af47e65f9a5670256d12..e6d9cec8f54f463da8ade021058e109599c94f38 100644 (file)
--- a/src/lib/dns/master_lexer_inputsource.cc
+++ b/src/lib/dns/master_lexer_inputsource.cc
@@ -96,9 +96,10 @@ InputSource::getChar() {
         buffer_.push_back(c);
     }
 
-    const int c = buffer_[buffer_pos_++];
+    const int c = buffer_[buffer_pos_];
+    ++buffer_pos_;
     if (c == '\n') {
-        line_++;
+        ++line_;
     }
 
     return (c);
@@ -112,9 +113,9 @@ InputSource::ungetChar() {
         isc_throw(UngetBeforeBeginning,
                   "Cannot skip before the start of buffer");
     } else {
-        buffer_pos_--;
+        --buffer_pos_;
         if (buffer_[buffer_pos_] == '\n') {
-            line_--;
+            --line_;
         }
     }
 }

diff --git a/src/lib/dns/tests/master_lexer_inputsource_unittest.cc b/src/lib/dns/tests/master_lexer_inputsource_unittest.cc
index 654185538762222c537b5ea6c976c263b9c1bbb5..db0cbec1b0480c03a6c935e2a3ed0d8c88eef142 100644 (file)
--- a/src/lib/dns/tests/master_lexer_inputsource_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_inputsource_unittest.cc
@@ -71,7 +71,7 @@ void
 checkGetAndUngetChar(InputSource& source,
                      const char* str, const size_t str_length)
 {
-    for (size_t i = 0; i < str_length; i++) {
+    for (size_t i = 0; i < str_length; ++i) {
         EXPECT_EQ(str[i], source.getChar());
         EXPECT_FALSE(source.atEOF());
     }
@@ -101,7 +101,7 @@ checkGetAndUngetChar(InputSource& source,
     // Now, let's go backwards in a loop. Start by skipping the EOF.
     source.ungetChar();
 
-    for (size_t i = 0; i < str_length; i++) {
+    for (size_t i = 0; i < str_length; ++i) {
         const size_t index = str_length - 1 - i;
         // Skip one character.
         source.ungetChar();
@@ -153,7 +153,7 @@ TEST_F(InputSourceTest, compact) {
     // Ungetting here must throw.
     EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning);
 
-    for (size_t i = 0; i < str_length_; i++) {
+    for (size_t i = 0; i < str_length_; ++i) {
         EXPECT_EQ(str_[i], source_.getChar());
         EXPECT_FALSE(source_.atEOF());
     }
@@ -206,7 +206,7 @@ TEST_F(InputSourceTest, markDuring) {
     // Ungetting here must throw.
     EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning);
 
-    for (size_t i = 13; i < str_length_; i++) {
+    for (size_t i = 13; i < str_length_; ++i) {
         EXPECT_EQ(str_[i], source_.getChar());
         EXPECT_FALSE(source_.atEOF());
     }
@@ -226,7 +226,7 @@ TEST_F(InputSourceTest, markDuring) {
     // Ungetting here must throw.
     EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning);
 
-    for (size_t i = 13; i < str_length_; i++) {
+    for (size_t i = 13; i < str_length_; ++i) {
         EXPECT_EQ(str_[i], source_.getChar());
         EXPECT_FALSE(source_.atEOF());
     }
@@ -246,7 +246,7 @@ TEST_F(InputSourceTest, lines) {
     size_t line = 1;
     while (!source_.atEOF()) {
         if (source_.getChar() == '\n') {
-            line++;
+            ++line;
         }
         EXPECT_EQ(line, source_.getCurrentLine());
     }