Merge branch 'master' into feature-602

This commit is contained in:
Carlos Martín committed 2011-11-29 16:00:05 +01:00
commit d591f01e6b
2 files changed
+13 -5

No files matched your search

+1 -1
View File
@@ -51,7 +51,7 @@ function fix_dir_slashes
function get_compare_target
{
echo "$1" | $SED 's/\/+/\//g' | $SED 's/\\/images$//'
echo "$1" | $SED 's/\/+/\//g' | $SED 's/\/images$//'
}
function full_src_and_dst_equal
+12 -4
View File
@@ -365,13 +365,17 @@ int FixedLeases::update_lease(Lease * lease)
int FixedLeases::add_leases(vector<const Attribute*>& vector_leases,
string& error_msg)
{
const VectorAttribute * single_attr_lease;
const VectorAttribute * single_attr_lease = 0;
int rc = -1;
string _mac;
string _ip;
single_attr_lease = dynamic_cast<const VectorAttribute *>(vector_leases[0]);
if ( vector_leases.size() > 0 )
{
single_attr_lease =
dynamic_cast<const VectorAttribute *>(vector_leases[0]);
}
if( single_attr_lease != 0 )
{
@@ -400,11 +404,15 @@ int FixedLeases::add_leases(vector<const Attribute*>& vector_leases,
int FixedLeases::remove_leases(vector<const Attribute*>& vector_leases,
string& error_msg)
{
const VectorAttribute * single_attr_lease;
const VectorAttribute * single_attr_lease = 0;
int rc = -1;
string _ip;
single_attr_lease = dynamic_cast<const VectorAttribute *>(vector_leases[0]);
if ( vector_leases.size() > 0 )
{
single_attr_lease =
dynamic_cast<const VectorAttribute *>(vector_leases[0]);
}
if( single_attr_lease != 0 )
{