From 7adda5f4156a2ac2a0561413c409d9c0dbc71f56 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@slot.vk.crocodile.org>
Date: Thu, 20 Jan 2011 14:39:06 -0800
Subject: [PATCH] see #1964 "rename methods printNamedObjectsForPolicy and
 printObjectGroups"

---
 src/cisco_lib/NATCompiler_asa8.cpp             |  4 ++--
 src/cisco_lib/NamedObjectsAndGroupsSupport.cpp |  8 ++++----
 src/cisco_lib/NamedObjectsAndGroupsSupport.h   | 16 ++++++++--------
 src/cisco_lib/PolicyCompiler_pix.cpp           |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/cisco_lib/NATCompiler_asa8.cpp b/src/cisco_lib/NATCompiler_asa8.cpp
index b1afa2253..e0a902387 100644
--- a/src/cisco_lib/NATCompiler_asa8.cpp
+++ b/src/cisco_lib/NATCompiler_asa8.cpp
@@ -417,8 +417,8 @@ void NATCompiler_asa8::compile()
 */
 
     add( new PrintClearCommands("Clear ACLs" ));
-    add( new printNamedObjectsForNAT(
-             "definitions of named objects", named_objects_manager));
+    add( new createNamedObjectsForNAT(
+             "create named objects", named_objects_manager));
     add( new printObjectGroups(
              "definitions of object groups", named_objects_manager));
     add( new PrintRule("generate PIX code" ));
diff --git a/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp b/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
index fbdf3a637..a6b35fc40 100644
--- a/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
+++ b/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
@@ -271,7 +271,7 @@ bool printObjectGroups::processNext()
     return true;
 }
 
-void printNamedObjectsCommon::printObjectsForRE(FWObject *re)
+void createNamedObjectsCommon::printObjectsForRE(FWObject *re)
 {
     if (RuleElement::cast(re)!=NULL && RuleElement::cast(re)->isAny()) return;
 
@@ -289,7 +289,7 @@ void printNamedObjectsCommon::printObjectsForRE(FWObject *re)
  * at this time, we have decided to not create named objects for
  * everything and use them only in cases where it is inevitable.
  */
-void printNamedObjectsForPolicy::printObjectsForRE(FWObject *re)
+void createNamedObjectsForPolicy::printObjectsForRE(FWObject *re)
 {
     if (RuleElement::cast(re)!=NULL && RuleElement::cast(re)->isAny()) return;
 
@@ -309,7 +309,7 @@ void printNamedObjectsForPolicy::printObjectsForRE(FWObject *re)
  * See #1962, it looks like ASA 8.3 does not support named objects or
  * object-groups in place of port specification in access-list commands.
  */
-bool printNamedObjectsForPolicy::processNext()
+bool createNamedObjectsForPolicy::processNext()
 {
     slurp();
     if (tmp_queue.size()==0) return false;
@@ -334,7 +334,7 @@ bool printNamedObjectsForPolicy::processNext()
 }
 
 
-bool printNamedObjectsForNAT::processNext()
+bool createNamedObjectsForNAT::processNext()
 {
     slurp();
     if (tmp_queue.size()==0) return false;
diff --git a/src/cisco_lib/NamedObjectsAndGroupsSupport.h b/src/cisco_lib/NamedObjectsAndGroupsSupport.h
index 9f47f6ddb..1ca92fe42 100644
--- a/src/cisco_lib/NamedObjectsAndGroupsSupport.h
+++ b/src/cisco_lib/NamedObjectsAndGroupsSupport.h
@@ -171,34 +171,34 @@ public:
         virtual bool processNext();
     };
 
-    class printNamedObjectsCommon :  public BasicRuleProcessor
+    class createNamedObjectsCommon :  public BasicRuleProcessor
     {
 protected:
         virtual void printObjectsForRE(libfwbuilder::FWObject *re);
         NamedObjectManager *named_objects_manager;
 public:
-        printNamedObjectsCommon(const std::string &n,
+        createNamedObjectsCommon(const std::string &n,
             NamedObjectManager *_m) : BasicRuleProcessor(n)
         {
             named_objects_manager = _m;
         }
     };
 
-    class printNamedObjectsForPolicy :  public printNamedObjectsCommon
+    class createNamedObjectsForPolicy :  public createNamedObjectsCommon
     {
 protected:
         virtual void printObjectsForRE(libfwbuilder::FWObject *re);
 public:
-        printNamedObjectsForPolicy(const std::string &n,
-            NamedObjectManager *m) : printNamedObjectsCommon(n, m) {}
+        createNamedObjectsForPolicy(const std::string &n,
+            NamedObjectManager *m) : createNamedObjectsCommon(n, m) {}
         virtual bool processNext();
     };
     
-    class printNamedObjectsForNAT :  public printNamedObjectsCommon
+    class createNamedObjectsForNAT :  public createNamedObjectsCommon
     {
 public:
-        printNamedObjectsForNAT(const std::string &n,
-            NamedObjectManager *m) : printNamedObjectsCommon(n, m) {}
+        createNamedObjectsForNAT(const std::string &n,
+            NamedObjectManager *m) : createNamedObjectsCommon(n, m) {}
         virtual bool processNext();
     };
     
diff --git a/src/cisco_lib/PolicyCompiler_pix.cpp b/src/cisco_lib/PolicyCompiler_pix.cpp
index 36276f6eb..31bf337c8 100644
--- a/src/cisco_lib/PolicyCompiler_pix.cpp
+++ b/src/cisco_lib/PolicyCompiler_pix.cpp
@@ -656,8 +656,8 @@ void PolicyCompiler_pix::compile()
 
     if (XMLTools::version_compare(vers, "8.3")>=0)
     {
-        add( new printNamedObjectsForPolicy(
-                 "definitions of named objects", named_objects_manager));
+        add( new createNamedObjectsForPolicy(
+                 "create named objects", named_objects_manager));
     }
 
     add( new printObjectGroups(