Commit f285297b authored by Richard Coleman's avatar Richard Coleman Committed by ROOL
Browse files

[549] Fix untranslated OS_SetVarVal error message

Deleting a non-existent system variable resulted in the error
message: System variable '%0' not found.

Version 6.60. Tagged as 'Kernel-6_60'
parent cf78d2c9
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "6.59"
Module_Version SETA 659
Module_MajorVersion SETS "6.60"
Module_Version SETA 660
Module_MinorVersion SETS ""
Module_Date SETS "01 Jun 2022"
Module_ApplicationDate SETS "01-Jun-22"
Module_ComponentName SETS "Kernel"
Module_FullVersion SETS "6.59"
Module_HelpVersion SETS "6.59 (01 Jun 2022)"
Module_FullVersion SETS "6.60"
Module_HelpVersion SETS "6.60 (01 Jun 2022)"
END
/* (6.59)
/* (6.60)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 6.59
#define Module_MajorVersion_CMHG 6.60
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 01 Jun 2022
#define Module_MajorVersion "6.59"
#define Module_Version 659
#define Module_MajorVersion "6.60"
#define Module_Version 660
#define Module_MinorVersion ""
#define Module_Date "01 Jun 2022"
......@@ -16,6 +16,6 @@
#define Module_ComponentName "Kernel"
#define Module_FullVersion "6.59"
#define Module_HelpVersion "6.59 (01 Jun 2022)"
#define Module_LibraryVersionInfo "6:59"
#define Module_FullVersion "6.60"
#define Module_HelpVersion "6.60 (01 Jun 2022)"
#define Module_LibraryVersionInfo "6:60"
......@@ -1653,8 +1653,7 @@ SetVarVal_DeleteIt
BL VarFindIt
; Error if not found
ADREQL r0, ErrorBlock_VarCantFind ; V set no. 1)
BEQ SetVarValBadExit_Translate
BEQ SVVNotFound
; Check if found vartype code that the supplied vartype was code too
LDRB lr, [r4]
TEQ lr, #VarType_Code
......@@ -1702,6 +1701,17 @@ SetVarVal_TestVExit
PullEnv
B SLVK_TestV
SVVNotFound
[ International
MOV r4, r0
ADRL r0, ErrorBlock_VarCantFind
BL TranslateError_UseR4
|
ADRL r0, ErrorBlock_VarCantFind
SETV
]
B SetVarVal_TestVExit
SetVarValBadExit_Translate
[ International
BL TranslateError
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment