Skip to content

Commit e10595e

Browse files
committed
Fix ambiguity between SMBIOSVersion (from SMBIOS) and BIOSVersion (from BIOS manufacturer)
Renamed GetBIOSVersionString* to GetSMBIOSVersionString*
1 parent 2706504 commit e10595e

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

VBScript/02_Upfront_Encapsulated_Code_With_No_Dependencies/GetBIOSVersionString.vbs renamed to VBScript/02_Upfront_Encapsulated_Code_With_No_Dependencies/GetSMBIOSVersionString.vbs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Function GetBIOSVersionString(ByRef strBIOSVersion)
1+
Function GetSMBIOSVersionString(ByRef strSMBIOSVersion)
22
'region FunctionMetadata ####################################################
33
' This function obtains the computer's systems management BIOS version number in string
44
' format, if available and configured by the computer's manufacturer.
55
'
6-
' The function takes one positional argument (strBIOSVersion), which is populated upon
6+
' The function takes one positional argument (strSMBIOSVersion), which is populated upon
77
' success with a string containing the computer's systems management BIOS version number in
88
' string format. The systems management BIOS version number is equivalent to the Win32_BIOS
99
' system property SMBIOSBIOSVersion
@@ -16,13 +16,13 @@ Function GetBIOSVersionString(ByRef strBIOSVersion)
1616
' data for the systems management BIOS version string is used.
1717
'
1818
' Example:
19-
' intReturnCode = GetBIOSVersionString(strBIOSVersion)
19+
' intReturnCode = GetSMBIOSVersionString(strSMBIOSVersion)
2020
' If intReturnCode >= 0 Then
2121
' ' The systems management BIOS version string was retrieved successfully and is
22-
' ' stored in strBIOSVersion
22+
' ' stored in strSMBIOSVersion
2323
' End If
2424
'
25-
' Version: 1.0.20210711.0
25+
' Version: 2.0.20210711.0
2626
'endregion FunctionMetadata ####################################################
2727

2828
'region License ####################################################
@@ -56,7 +56,7 @@ Function GetBIOSVersionString(ByRef strBIOSVersion)
5656

5757
'region DependsOn ####################################################
5858
' GetBIOSInstances()
59-
' GetBIOSVersionStringUsingBIOSInstances()
59+
' GetSMBIOSVersionStringUsingBIOSInstances()
6060
'endregion DependsOn ####################################################
6161

6262
Dim intFunctionReturn
@@ -68,13 +68,13 @@ Function GetBIOSVersionString(ByRef strBIOSVersion)
6868
intFunctionReturn = GetBIOSInstances(arrBIOSInstances)
6969
If intFunctionReturn >= 0 Then
7070
' At least one Win32_BIOS instance was retrieved successfully
71-
intFunctionReturn = GetBIOSVersionStringUsingBIOSInstances(strResult, arrBIOSInstances)
71+
intFunctionReturn = GetSMBIOSVersionStringUsingBIOSInstances(strResult, arrBIOSInstances)
7272
If intFunctionReturn >= 0 Then
7373
' The computer's BIOS version string was retrieved successfully and is stored in
7474
' strResult
75-
strBIOSVersion = strResult
75+
strSMBIOSVersion = strResult
7676
End If
7777
End If
7878

79-
GetBIOSVersionString = intFunctionReturn
79+
GetSMBIOSVersionString = intFunctionReturn
8080
End Function

VBScript/02_Upfront_Encapsulated_Code_With_No_Dependencies/GetBIOSVersionStringUsingBIOSInstances.vbs renamed to VBScript/02_Upfront_Encapsulated_Code_With_No_Dependencies/GetSMBIOSVersionStringUsingBIOSInstances.vbs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Function GetBIOSVersionStringUsingBIOSInstances(ByRef strBIOSVersion, ByVal arrBIOSInstances)
1+
Function GetSMBIOSVersionStringUsingBIOSInstances(ByRef strSMBIOSVersion, ByVal arrBIOSInstances)
22
'region FunctionMetadata ####################################################
33
' Assuming that arrBIOSInstances represents an array / collection of the available BIOS
44
' instances (of type Win32_BIOS), this function obtains the computer's systems management
@@ -9,7 +9,7 @@ Function GetBIOSVersionStringUsingBIOSInstances(ByRef strBIOSVersion, ByVal arrB
99
' systems return a version like "A23"
1010
'
1111
' The function takes two positional arguments:
12-
' - The first argument (strBIOSVersion) is populated upon success with a string
12+
' - The first argument (strSMBIOSVersion) is populated upon success with a string
1313
' containing the computer's systems management BIOS version number in string format.
1414
' The systems management BIOS version number is equivalent to the Win32_BIOS system
1515
' property SMBIOSBIOSVersion
@@ -27,14 +27,14 @@ Function GetBIOSVersionStringUsingBIOSInstances(ByRef strBIOSVersion, ByVal arrB
2727
' intReturnCode = GetBIOSInstances(arrBIOSInstances)
2828
' If intReturnCode >= 0 Then
2929
' ' At least one Win32_BIOS instance was retrieved successfully
30-
' intReturnCode = GetBIOSVersionStringUsingBIOSInstances(strBIOSVersion, arrBIOSInstances)
30+
' intReturnCode = GetSMBIOSVersionStringUsingBIOSInstances(strSMBIOSVersion, arrBIOSInstances)
3131
' If intReturnCode >= 0 Then
3232
' ' The systems management BIOS version string was retrieved successfully and is
33-
' ' stored in strBIOSVersion
33+
' ' stored in strSMBIOSVersion
3434
' End If
3535
' End If
3636
'
37-
' Version: 1.0.20210706.0
37+
' Version: 2.0.20210711.0
3838
'endregion FunctionMetadata ####################################################
3939

4040
'region License ####################################################
@@ -152,8 +152,8 @@ Function GetBIOSVersionStringUsingBIOSInstances(ByRef strBIOSVersion, ByVal arrB
152152
End If
153153

154154
If intFunctionReturn >= 0 Then
155-
strBIOSVersion = strResultToReturn
155+
strSMBIOSVersion = strResultToReturn
156156
End If
157157

158-
GetBIOSVersionStringUsingBIOSInstances = intFunctionReturn
158+
GetSMBIOSVersionStringUsingBIOSInstances = intFunctionReturn
159159
End Function

0 commit comments

Comments
 (0)