shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

bug 1212: Pass references instead of pointers

Browse Source
This commit is contained in:
Ruben S. Montero 2012-04-27 00:12:55 +02:00
parent ae6df524bb
commit 71e4dc6967
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Image.h
View File

@ -339,7 +339,7 @@ public:
* @return 0 on success, -1 otherwise
*/
int disk_attribute( VectorAttribute * disk,
ImageType* img_type,
ImageType& img_type,
string& dev_prefix);
/**

2
include/ImagePool.h
View File

@ -148,7 +148,7 @@ public:
*/
int disk_attribute(VectorAttribute * disk,
int disk_id,
Image::ImageType * img_type,
Image::ImageType& img_type,
string& dev_prefix,
int uid,
int& image_id,

10
src/image/Image.cc
View File

@ -438,7 +438,7 @@ int Image::from_xml(const string& xml)
/* ------------------------------------------------------------------------ */
int Image::disk_attribute( VectorAttribute * disk,
ImageType* img_type,
ImageType& img_type,
string& dev_prefix)
{
string bus;
@ -448,10 +448,10 @@ int Image::disk_attribute( VectorAttribute * disk,
ostringstream iid;
*img_type = type;
bus = disk->vector_value("BUS");
target = disk->vector_value("TARGET");
driver = disk->vector_value("DRIVER");
img_type = type;
bus = disk->vector_value("BUS");
target = disk->vector_value("TARGET");
driver = disk->vector_value("DRIVER");
iid << oid;
string template_bus;

16
src/image/ImagePool.cc
View File

@ -214,13 +214,13 @@ static int get_disk_id(const string& id_s)
/* -------------------------------------------------------------------------- */
int ImagePool::disk_attribute(VectorAttribute * disk,
int disk_id,
Image::ImageType * img_type,
string& dev_prefix,
int uid,
int& image_id,
string& error_str)
int ImagePool::disk_attribute(VectorAttribute * disk,
int disk_id,
Image::ImageType& img_type,
string& dev_prefix,
int uid,
int& image_id,
string& error_str)
{
string source;
Image * img = 0;
@ -278,7 +278,7 @@ int ImagePool::disk_attribute(VectorAttribute * disk,
if ( type == "SWAP" || type == "FS" )
{
dev_prefix = _default_dev_prefix;
*img_type = Image::DATABLOCK;
img_type = Image::DATABLOCK;
}
else
{

2
src/vm/VirtualMachine.cc
View File

@ -938,7 +938,7 @@ int VirtualMachine::get_disk_images(string& error_str)
rc = ipool->disk_attribute(disk,
i,
&img_type,
img_type,
dev_prefix,
uid,
image_id,