- use template to search through ACL signatures

diff --git a/snapper/Acls.cc b/snapper/Acls.cc
index 83821cb2e77c802851984a0a9dba261fc021d4a5..ed9a66d5a30f91d1f671bc24d6c278c09bc343f4 100644 (file)
--- a/snapper/Acls.cc
+++ b/snapper/Acls.cc
@@ -26,18 +26,14 @@
 #include "snapper/AppUtil.h"
 #include "snapper/Exception.h"
 #include "snapper/Log.h"
+#include "snapper/SnapperTmpl.h"
 
 namespace snapper
 {
     bool
     is_acl_signature(const std::string& name)
     {
-       for (std::vector<string>::const_iterator cit = _acl_signatures.begin(); cit != _acl_signatures.end(); cit++)
-       {
-           if (name == *cit)
-               return true;
-       }
-       return false;
+       return contains(_acl_signatures, name);
     }
 
     Acls::Acls(const string& path)

diff --git a/snapper/File.cc b/snapper/File.cc
index 4e0fee5c2053da165965e4580bdf5ce76a3914f9..7865ffb8b0e1b792942a249206f2e07ce153530f 100644 (file)
--- a/snapper/File.cc
+++ b/snapper/File.cc
@@ -572,7 +572,7 @@ namespace snapper
 
            ret_val = true;
        }
-       catch (const SnapperException& e)
+       catch (const AclException& e)
        {
            ret_val = false;
        }

diff --git a/snapper/XAttributes.cc b/snapper/XAttributes.cc
index bcf8c6f6c1ab97689bb7922de4ddaa7bc32e61c1..ccb8509af6fe1dcc5fbe8b39b2d3753f29ed2990 100644 (file)
--- a/snapper/XAttributes.cc
+++ b/snapper/XAttributes.cc
@@ -36,6 +36,7 @@
 #include "snapper/Log.h"
 #include "snapper/XAttributes.h"
 #include "snapper/Acls.h"
+#include "snapper/SnapperTmpl.h"
 
 
 namespace snapper
@@ -47,18 +48,12 @@ namespace snapper
 
        bool operator()(const xa_pair_t& pair)
        {
-           for (vector<string>::const_iterator cit = acl_sigs.begin(); cit != acl_sigs.end(); cit++)
-               if (pair.first == *cit)
-                   return true;
-           return false;
+           return contains(acl_sigs, pair.first);
        }
 
        bool operator()(const string& name)
        {
-           for (vector<string>::const_iterator cit = acl_sigs.begin(); cit != acl_sigs.end(); cit++)
-               if (name == *cit)
-                   return true;
-           return false;
+           return contains(acl_sigs, name);
        }
 
        const vector<string>& acl_sigs;
@@ -71,14 +66,8 @@ namespace snapper
        : map(xamap), acl_sigs(acl_sigs) {}
        void operator()(const xa_pair_t& xapair)
        {
-           for (vector<string>::const_iterator cit = acl_sigs.begin(); cit != acl_sigs.end(); cit++)
-           {
-               if (*cit == xapair.first)
-               {
-                   map.insert(xapair);
-                   break;
-               }
-           }
+           if (contains(acl_sigs, xapair.first))
+               map.insert(xapair);
        }
 
        xa_map_t& map;