[yast-commit] r67498 - in /trunk/s390/src: modules/ZFCPController.ycp zfcp/dialogs.ycp

Author: aschnell Date: Tue Feb 21 18:59:57 2012 New Revision: 67498 URL: http://svn.opensuse.org/viewcvs/yast?rev=67498&view=rev Log: - removed HexNumSize Modified: trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.ycp?rev=67498&r1=67497&r2=67498&view=diff ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 18:59:57 2012 @@ -38,30 +38,6 @@ boolean disk_configured = false; -/** - * Update the size of hexa number via adding leading zeros - * @param hex string a hexa number (withou or without leading 0x) - * @param digits the count of digits (excluding leading 0x) - * @return hex string with specified length - */ -global string HexNumSize (string hex, integer digits) { - boolean leading0x = false; - if (substring (hex, 0, 2) == "0x") - { - leading0x = true; - hex = substring (hex, 2); - } - while (size (hex) < digits) - { - hex = "0" + hex; - } - if (leading0x) - { - hex = "0x" + hex; - } - return hex; -} - /** * Data was modified? @@ -592,7 +568,7 @@ } string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, - HexNumSize(wwpn, 16), HexNumSize(lun, 16), 1); + wwpn, lun, 1); y2milestone("Running command \"%1\"", command); integer ret = (integer) SCR::Execute(.target.bash, command); y2milestone("Command \"%1\" returned with exit code %2", command, ret); @@ -612,7 +588,7 @@ global void DeactivateDisk(string channel, string wwpn, string lun) { string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, - HexNumSize(wwpn, 16), HexNumSize(lun, 16), 0); + wwpn, lun, 0); y2milestone("Running command \"%1\"", command); integer ret = (integer) SCR::Execute(.target.bash, command); y2milestone("Command \"%1\" returned with exit code %2", command, ret); Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67498&r1=67497&r2=67498&view=diff ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 18:59:57 2012 @@ -69,13 +69,9 @@ list<term> items = []; items = maplist(integer k, map d, devices, { - string dev_name = d["dev_name"]:""; string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; string fcp_lun = d["detail", "fcp_lun"]:"unknown"; - if (fcp_lun != "unknown") - fcp_lun = ZFCPController::HexNumSize (fcp_lun, 16); - return `item(`id(k), channel, wwpn, fcp_lun); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org