From 48b371dcda5d1d4f15dfd60e995c4d3a1ca49dc0 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 30 Nov 2012 03:17:49 +0100 Subject: [PATCH] bug-1669: Wrong condition checks in some files. Makes some string treatment case-senitive, as opposed with the convenction in OpenNebula (strings are *not* case sensitive) (cherry picked from commit d22567fe23fd8e7e25fed2f1474e7020c6375bd9) --- src/scheduler/include/SchedulerPolicy.h | 2 +- src/vmm/LibVirtDriverKVM.cc | 16 +++++----------- src/vmm/LibVirtDriverVMware.cc | 5 +---- src/vmm/XenDriver.cc | 5 +---- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/scheduler/include/SchedulerPolicy.h b/src/scheduler/include/SchedulerPolicy.h index ae12854c0c..b62efb3149 100644 --- a/src/scheduler/include/SchedulerPolicy.h +++ b/src/scheduler/include/SchedulerPolicy.h @@ -43,7 +43,7 @@ public: policy(vm); - if(priority.empty()!=true) + if(!priority.empty()) { sw.max = fabs(*max_element( priority.begin(), diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 6aca971987..8a0bcd80c0 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -331,10 +331,7 @@ int LibVirtDriver::deployment_description_kvm( // ---- Disk type and source for the image ---- - if (type.empty() == false) - { - transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper); - } + transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper); if ( type == "BLOCK" ) { @@ -532,13 +529,10 @@ int LibVirtDriver::deployment_description_kvm( passwd = graphics->vector_value("PASSWD"); keymap = graphics->vector_value("KEYMAP"); - if (type.empty() != false) - { - transform(type.begin(), - type.end(), - type.begin(), - (int(*)(int))tolower); - } + transform(type.begin(), + type.end(), + type.begin(), + (int(*)(int))tolower); if ( type == "vnc" || type == "spice" ) { diff --git a/src/vmm/LibVirtDriverVMware.cc b/src/vmm/LibVirtDriverVMware.cc index af020b506c..ae02be7812 100644 --- a/src/vmm/LibVirtDriverVMware.cc +++ b/src/vmm/LibVirtDriverVMware.cc @@ -211,10 +211,7 @@ int LibVirtDriver::deployment_description_vmware( } } - if (type.empty() == false) - { - transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper); - } + transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper); // ---- Disk type and source for the image ---- diff --git a/src/vmm/XenDriver.cc b/src/vmm/XenDriver.cc index 5dcd0110f8..23841a7db8 100644 --- a/src/vmm/XenDriver.cc +++ b/src/vmm/XenDriver.cc @@ -245,10 +245,7 @@ int XenDriver::deployment_description( goto error_disk; } - if (type.empty() == false) - { - transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper); - } + transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper); mode = "w";