Author: aschnell Date: Tue Jul 29 17:00:07 2008 New Revision: 49486 URL: http://svn.opensuse.org/viewcvs/yast?rev=49486&view=rev Log: - some consistency Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=49486&r1=49485&r2=49486&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Jul 29 17:00:07 2008 @@ -3652,7 +3652,7 @@ } -int Storage::getMdState(const string& name, MdStateInfo& info) +int Storage::getMdStateInfo(const string& name, MdStateInfo& info) { int ret = 0; assertInit(); Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=49486&r1=49485&r2=49486&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue Jul 29 17:00:07 2008 @@ -435,7 +435,7 @@ int changeMdChunk( const string& name, unsigned long chunk ); int changeMdParity( const string& name, storage::MdParity ptype ); int checkMd( const string& name ); - int getMdState(const string& name, MdStateInfo& info); + int getMdStateInfo(const string& name, MdStateInfo& info); int computeMdSize(MdType md_type, list<string> devices, unsigned long long& sizeK); Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=49486&r1=49485&r2=49486&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Jul 29 17:00:07 2008 @@ -148,8 +148,8 @@ * Contains info about a generic container. */ struct ContainerInfo - { - ContainerInfo() {}; + { + ContainerInfo() {} CType type; unsigned volcnt; string device; @@ -157,14 +157,14 @@ UsedByType usedBy; string usedByName; bool readonly; - }; + }; /** * Contains info about a disk */ struct DiskInfo - { - DiskInfo() {}; + { + DiskInfo() {} unsigned long long sizeK; unsigned long long cylSizeB; unsigned long cyl; @@ -177,14 +177,14 @@ unsigned maxPrimary; bool initDisk; bool iscsi; - }; + }; /** * Contains info about a LVM VG */ struct LvmVgInfo - { - LvmVgInfo() {}; + { + LvmVgInfo() {} unsigned long long sizeK; unsigned long long peSize; unsigned long peCount; @@ -195,14 +195,14 @@ string devices; string devices_add; string devices_rem; - }; + }; /** * Contains info about a EVMS Container */ struct EvmsCoInfo - { - EvmsCoInfo() {}; + { + EvmsCoInfo() {} unsigned long long sizeK; unsigned long long peSize; unsigned long peCount; @@ -214,31 +214,31 @@ string devices; string devices_add; string devices_rem; - }; + }; /** * Contains info about a DmPart disk */ struct DmPartCoInfo - { - DmPartCoInfo() {}; + { + DmPartCoInfo() {} DiskInfo d; string devices; unsigned long minor; - }; + }; struct DmraidCoInfo - { - DmraidCoInfo() {}; + { + DmraidCoInfo() {} DmPartCoInfo p; - }; + }; /** * Contains info about a volume. */ struct VolumeInfo - { - VolumeInfo() {}; + { + VolumeInfo() {} unsigned long long sizeK; unsigned long major; unsigned long minor; @@ -264,11 +264,11 @@ bool resize; bool ignore_fs; unsigned long long OrigSizeK; - }; + }; struct PartitionAddInfo { - PartitionAddInfo() {}; + PartitionAddInfo() {} unsigned nr; unsigned long cylStart; unsigned long cylSize; @@ -283,8 +283,8 @@ * Contains info about a partition. */ struct PartitionInfo - { - PartitionInfo() {}; + { + PartitionInfo() {} PartitionInfo& operator=( const PartitionAddInfo& rhs ); VolumeInfo v; unsigned nr; @@ -295,14 +295,14 @@ bool boot; string udevPath; string udevId; - }; + }; /** * Contains info about a LVM LV. */ struct LvmLvInfo - { - LvmLvInfo() {}; + { + LvmLvInfo() {} VolumeInfo v; unsigned stripe; unsigned stripe_size; @@ -311,28 +311,28 @@ string allocation; string dm_table; string dm_target; - }; + }; /** * Contains info about a EVMS Volume. */ struct EvmsInfo - { - EvmsInfo() {}; + { + EvmsInfo() {} VolumeInfo v; unsigned stripe; unsigned stripe_size; bool compatible; string dm_table; string dm_target; - }; + }; /** * Contains info about a software raid device. */ struct MdInfo - { - MdInfo() {}; + { + MdInfo() {} VolumeInfo v; unsigned nr; unsigned type; @@ -341,13 +341,14 @@ string sb_ver; unsigned long chunk; string devices; - }; + }; /** - * Contains state of a software raid device. + * Contains state info about a software raid device. */ struct MdStateInfo { + MdStateInfo() {} bool active; bool degraded; }; @@ -356,69 +357,69 @@ * Contains info about a nfs volumes */ struct NfsInfo - { - NfsInfo() {}; + { + NfsInfo() {} VolumeInfo v; - }; + }; /** * Contains info about a file based loop devices. */ struct LoopInfo - { - LoopInfo() {}; + { + LoopInfo() {} VolumeInfo v; bool reuseFile; unsigned nr; string file; - }; + }; /** * Contains info about a DM volume. */ struct DmInfo - { - DmInfo() {}; + { + DmInfo() {} VolumeInfo v; unsigned nr; string table; string target; - }; + }; /** * Contains info about a DmPart volume. */ struct DmPartInfo - { - DmPartInfo() {}; + { + DmPartInfo() {} VolumeInfo v; PartitionAddInfo p; bool part; string table; string target; - }; + }; /** * Contains info about a DMRAID volume. */ struct DmraidInfo - { - DmraidInfo() {}; + { + DmraidInfo() {} DmPartInfo p; - }; + }; /** * Contains info about a DM volume. */ struct ContVolInfo - { + { ContVolInfo() {numeric=false; nr=0; type=CUNKNOWN;}; CType type; string cname; string vname; bool numeric; unsigned nr; - }; + }; /** * Contains info about a partition slot. @@ -1813,7 +1814,7 @@ * @param info record that gets filled with raid special data * @return zero if all is ok, a negative number to indicate an error */ - virtual int getMdState(const string& name, MdStateInfo& info) = 0; + virtual int getMdStateInfo(const string& name, MdStateInfo& info) = 0; /** * Compute the size of a raid device. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org