Author: aschnell Date: Mon Aug 3 16:58:29 2009 New Revision: 58262 URL: http://svn.opensuse.org/viewcvs/yast?rev=58262&view=rev Log: - moved function MaxSizeK() to Partitions module Modified: trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=58262&r1=58261&r2=58262&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Mon Aug 3 16:58:29 2009 @@ -750,6 +750,17 @@ } + global integer MaxSizeK(string dlabel) + { + integer ret = 0; + any caps = LibStorage::DlabelCapabilities::new("LibStorage::DlabelCapabilities"); + if (LibStorage::StorageInterface::getDlabelCapabilities(sint, dlabel, caps)) + ret = LibStorage::DlabelCapabilities::swig_maxSizeK_get(caps); + y2milestone("MaxSizeK dlabel:%1 ret:%2", dlabel, ret); + return ret; + } + + global define string RdonlyText( string disk, boolean expert_partitioner ) ``{ string text = ""; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=58262&r1=58261&r2=58262&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 3 16:58:29 2009 @@ -2063,22 +2063,10 @@ return ret; } -global integer MaxSizeLabelK( map disk ) - { - integer ret = 0; - string dlabel = disk["label"]:""; - any caps = LibStorage::DlabelCapabilities::new("LibStorage::DlabelCapabilities"); - if (LibStorage::StorageInterface::getDlabelCapabilities(sint, dlabel, caps)) - { - ret = LibStorage::DlabelCapabilities::swig_maxSizeK_get(caps); - } - y2milestone("MaxSizeLabelK %1 is %2", dlabel, ret); - return ret; - } global integer MaxCylLabel( map disk, integer start_cyl ) { - integer ret = MaxSizeLabelK(disk); + integer ret = Partitions::MaxSizeK(disk["label"]:""); y2milestone( "MaxCylLabel val_k:%1 cyl_size:%2", ret, disk["cyl_size"]:1 ); integer cylk2 = disk["cyl_size"]:1/512; if( cylk2<2 ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org