Author: aschnell
Date: Wed Jul 16 10:07:36 2008
New Revision: 49141
URL: http://svn.opensuse.org/viewcvs/yast?rev=49141&view=rev
Log:
- stricter type definitions
Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp
branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp?rev=49141&r1=49140&r2=49141&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp Wed Jul 16 10:07:36 2008
@@ -347,8 +347,8 @@
* @parm new_val map that contains a partition
* @parm file_systems filesystem definitions
*/
-define map FileSystemOptions( map< any, map > org_fs_options,
- map fs_define )
+map > FileSystemOptions(map< any, map > org_fs_options,
+ map fs_define)
``{
y2milestone( "FileSystemOptions org_fs_options:%1 fs_define:%2", org_fs_options, fs_define );
map > fs_options = org_fs_options;
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp?rev=49141&r1=49140&r2=49141&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Wed Jul 16 10:07:36 2008
@@ -30,6 +30,7 @@
boolean crypt_fs = false; // TODO
string mount = data["mount"]:"";
boolean do_mount = mount != "";
+ map > fs_options = data["fs_options"]:$[];
if (data["new"]:false && !data["formatmount_proposed"]:false)
{
@@ -47,7 +48,7 @@
mount = mount_point_proposal;
do_mount = mount != "";
data["used_fs"] = used_fs;
- data["fs_options"] = FileSystems::DefaultFormatOptions(data);
+ fs_options = FileSystems::DefaultFormatOptions(data);
}
term tmp1 = `Empty();
@@ -129,7 +130,7 @@
case `fs_options:
map filesystems = FileSystems::GetAllFileSystems(true, true);
- data["fs_options"] = FileSystemOptions(data["fs_options"]:$[], filesystems[data["used_fs"]:`unknown]:$[]);
+ fs_options = FileSystemOptions(fs_options, filesystems[data["used_fs"]:`unknown]:$[]);
break;
case `fstab_options:
@@ -176,6 +177,7 @@
data["enc_type"] = `none;
data["format"] = do_format;
+ data["fs_options"] = fs_options;
data["mount"] = do_mount ? mount : "";
if (!do_format || !crypt_fs)
Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp?rev=49141&r1=49140&r2=49141&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp Wed Jul 16 10:07:36 2008
@@ -1439,9 +1439,9 @@
return( fst_default );
}
-global define map DefaultFormatOptions( map part )
+global map > DefaultFormatOptions( map part )
``{
- map ret = $[];
+ map > ret = $[];
symbol fsys = part["used_fs"]:`none;
if( part["format"]:false )
{
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
