Browse Source

[trac553] minor style fixes: position of '*', avoid implicit conversion to bool.

JINMEI Tatuya 14 years ago
parent
commit
ce7bc899e7
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/lib/datasrc/tests/memory_datasrc_unittest.cc

+ 5 - 5
src/lib/datasrc/tests/memory_datasrc_unittest.cc

@@ -825,7 +825,7 @@ TEST_F(MemoryZoneTest, nestedEmptyWildcard) {
     }
 
     // Domains to test
-    const char *names[] = {
+    const char* names[] = {
         "*.foo.*.bar.example.org",
         "foo.*.bar.example.org",
         "*.bar.example.org",
@@ -836,7 +836,7 @@ TEST_F(MemoryZoneTest, nestedEmptyWildcard) {
     {
         SCOPED_TRACE("Asking directly for A on parent nodes");
 
-        for (const char **name(names); *name; ++ name) {
+        for (const char** name(names); *name != NULL; ++ name) {
             SCOPED_TRACE(string("Node ") + *name);
             findTest(Name(*name), RRType::A(), Zone::NXRRSET);
         }
@@ -845,7 +845,7 @@ TEST_F(MemoryZoneTest, nestedEmptyWildcard) {
     {
         SCOPED_TRACE("Asking for ANY on parent nodes");
 
-        for (const char **name(names); *name; ++ name) {
+        for (const char** name(names); *name != NULL; ++ name) {
             SCOPED_TRACE(string("Node ") + *name);
 
             RRsetList target;
@@ -880,14 +880,14 @@ MemoryZoneTest::doCancelWildcardTest() {
     {
         SCOPED_TRACE("Neighbor wildcards to foo.example.org");
 
-        const char *names[] = {
+        const char* names[] = {
             "aaa.bbb.wild.example.org",
             "aaa.zzz.wild.example.org",
             "zzz.wild.example.org",
             NULL
         };
 
-        for (const char **name(names); *name; ++ name) {
+        for (const char** name(names); *name != NULL; ++ name) {
             SCOPED_TRACE(string("Node ") + *name);
 
             findTest(Name(*name), RRType::A(), Zone::SUCCESS, false, rr_wild_,