From 2a5f302b35739b87e235aac48be2a2906dcfe4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 5 Dec 2012 16:48:56 +0100 Subject: [PATCH] Feature #1617: Minor edits, typos --- include/Datastore.h | 6 +++--- include/Image.h | 6 +++--- src/image/ImagePool.cc | 2 +- src/rm/RequestManagerImage.cc | 2 +- src/rm/RequestManagerVirtualMachine.cc | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/Datastore.h b/include/Datastore.h index fe134af97e..a4b8d4243d 100644 --- a/include/Datastore.h +++ b/include/Datastore.h @@ -40,7 +40,7 @@ public: }; /** - * Return the string representation of an DatastoreType + * Return the string representation of a DatastoreType * @param ob the type * @return the string */ @@ -56,9 +56,9 @@ public: }; /** - * Return the string representation of an DatastoreType + * Return the string representation of a DatastoreType * @param str_type string representing the DatastoreTypr - * @return the ImageType (defaults to IMAGE_DS) + * @return the DatastoreType (defaults to IMAGE_DS) */ static DatastoreType str_to_type(string& str_type); diff --git a/include/Image.h b/include/Image.h index 4cc2e0d967..d23530fadc 100644 --- a/include/Image.h +++ b/include/Image.h @@ -38,9 +38,9 @@ public: OS = 0, /** < Base OS image */ CDROM = 1, /** < An ISO9660 image */ DATABLOCK = 2, /** < User persistent data device */ - KERNEL = 3, /** < Context, kernels and initrd files */ - RAMDISK = 4, /** < Context, kernels and initrd files */ - CONTEXT = 5 /** < Context, kernels and initrd files */ + KERNEL = 3, /** < Kernel files */ + RAMDISK = 4, /** < Initrd files */ + CONTEXT = 5 /** < Context files */ }; /** diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc index 86d111bc23..5473b188d2 100644 --- a/src/image/ImagePool.cc +++ b/src/image/ImagePool.cc @@ -212,7 +212,7 @@ error_types_missmatch_file: error_types_missmatch_image: oss << "IMAGES of type KERNEL, RAMDISK and CONTEXT cannot be registered" - " in a IMAGE_DS datastore"; + " in an IMAGE_DS datastore"; goto error_common; error_duplicated: diff --git a/src/rm/RequestManagerImage.cc b/src/rm/RequestManagerImage.cc index 3d32958eb6..6b0722c0c1 100644 --- a/src/rm/RequestManagerImage.cc +++ b/src/rm/RequestManagerImage.cc @@ -270,7 +270,7 @@ void ImageClone::request_execute( case Image::CONTEXT: failure_response(ACTION, allocate_error("KERNEL, RAMDISK and CONTEXT files cannot be " - "clonned."), att); + "cloned."), att); img->unlock(); return; } diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 620aa432bd..016354557d 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -652,7 +652,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis case Image::RAMDISK: case Image::CONTEXT: failure_response(INTERNAL, - request_error("Cannot save_as image of type FILE", ""), + request_error("Cannot save_as image of type " + Image::type_to_str(type), ""), att); return; }