[Oval-commits] r85 - in trunk/Interpreters: src xml
Pavel Vinogradov
blaze-guest at alioth.debian.org
Sun Jul 15 18:56:22 UTC 2007
Author: blaze-guest
Date: 2007-07-15 18:56:22 +0000 (Sun, 15 Jul 2007)
New Revision: 85
Modified:
trunk/Interpreters/src/State.h
trunk/Interpreters/xml/oval-common-schema.xsd
Log:
Fix mistakes in comments
Modified: trunk/Interpreters/src/State.h
===================================================================
--- trunk/Interpreters/src/State.h 2007-07-15 10:43:08 UTC (rev 84)
+++ trunk/Interpreters/src/State.h 2007-07-15 18:56:22 UTC (rev 85)
@@ -44,7 +44,7 @@
/**
This class represents a state in the oval definition schema.
- States are used by tests for analysis pruposes. The State
+ States are used by tests for analysis purposes. The State
declares what an expected condition is for some item on a system.
*/
class State : public AbsState {
Modified: trunk/Interpreters/xml/oval-common-schema.xsd
===================================================================
--- trunk/Interpreters/xml/oval-common-schema.xsd 2007-07-15 10:43:08 UTC (rev 84)
+++ trunk/Interpreters/xml/oval-common-schema.xsd 2007-07-15 18:56:22 UTC (rev 85)
@@ -150,42 +150,42 @@
<xsd:restriction base="xsd:string">
<xsd:enumeration value="binary">
<xsd:annotation>
- <xsd:documentation>The binary datatype is used to represent data that is in raw (non-printable) form. Values should be hex strings. Expected operations within OVAL for binary values are 'equals' and 'not equals'.</xsd:documentation>
+ <xsd:documentation>The binary datatype is used to represent data that is in raw (non-printable) form. Values should be hex strings. Expected operations within OVAL for binary values are 'equals' and 'not equal'.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="boolean">
<xsd:annotation>
- <xsd:documentation>The boolean datatype represent standard boolean data, either true or false. Expected operations within OVAL for boolean values are 'equals' and 'not equals'.</xsd:documentation>
+ <xsd:documentation>The boolean datatype represent standard boolean data, either true or false. Expected operations within OVAL for boolean values are 'equals' and 'not equal'.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="evr_string">
<xsd:annotation>
- <xsd:documentation>The evr_string datatype represents the epoch, version, and release fields as a single version string. It has the form "EPOCH:VERSION-RELEASE". Comparisons involving this datatype should follow the algorithm of librpm's rpmvercmp() function. Expected operations within OVAL for evr_string values are 'equals', 'not equals', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
+ <xsd:documentation>The evr_string datatype represents the epoch, version, and release fields as a single version string. It has the form "EPOCH:VERSION-RELEASE". Comparisons involving this datatype should follow the algorithm of librpm's rpmvercmp() function. Expected operations within OVAL for evr_string values are 'equals', 'not equal', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="float">
<xsd:annotation>
- <xsd:documentation>The float datatype describes standard float data. Expected operations within OVAL for float values are 'equals', 'not equals', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
+ <xsd:documentation>The float datatype describes standard float data. Expected operations within OVAL for float values are 'equal', 'not equal', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ios_version">
<xsd:annotation>
- <xsd:documentation>The ios_version datatype describes Cisco IOS Train strings. These are in essence version strings for IOS. Please refer to Cisco's IOS Reference Guide for information on how to compare different Trains as they follow a very specific pattern. Expected operations within OVAL for ios_version values are 'equals', 'not equals', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
+ <xsd:documentation>The ios_version datatype describes Cisco IOS Train strings. These are in essence version strings for IOS. Please refer to Cisco's IOS Reference Guide for information on how to compare different Trains as they follow a very specific pattern. Expected operations within OVAL for ios_version values are 'equals', 'not equal', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="int">
<xsd:annotation>
- <xsd:documentation>The int datatype describes standard integer data. Expected operations within OVAL for int values are 'equals', 'not equals', 'greater than', 'greater than or equal', 'less than', 'less than or equal', 'bitwise and', and 'bitwise or'.</xsd:documentation>
+ <xsd:documentation>The int datatype describes standard integer data. Expected operations within OVAL for int values are 'equals', 'not equal', 'greater than', 'greater than or equal', 'less than', 'less than or equal', 'bitwise and', and 'bitwise or'.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="string">
<xsd:annotation>
- <xsd:documentation>The string datatype describes standard string data. Expected operations within OVAL for string values are 'equals', 'not equals', 'pattern match'.</xsd:documentation>
+ <xsd:documentation>The string datatype describes standard string data. Expected operations within OVAL for string values are 'equals', 'not equal', 'pattern match'.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="version">
<xsd:annotation>
- <xsd:documentation>The version datatype represents a value that is a hierarchical list of non-negative integers separated by a single character delimiter. Expected operations within OVAL for version values are 'equals', 'not equals', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
+ <xsd:documentation>The version datatype represents a value that is a hierarchical list of non-negative integers separated by a single character delimiter. Expected operations within OVAL for version values are 'equals', 'not equal', 'greater than', 'greater than or equal', 'less than', and 'less than or equal'.</xsd:documentation>
<xsd:documentation>For example '#.#.#' or '#-#-#-#' where the numbers to the left are more significant than the numbers to the right. When performing an 'equals' operation on a version datatype, you should first check the left most number for equality. If that fails, then the values are not equal. If it succeeds, then check the second left most number for equality. Continue checking the numbers from left to right until the last number has been checked. If, after testing all the previous numbers, the last number is equal then the two versions are equal. When performing other operations, such as 'less than', 'less than or equal', 'greater than, or 'greater than or equal', similar logic as above is used. Start with the left most number and move from left to right. For each number, check if it is less than the number you are testing against. If it is, then the version in question is less than the version you are testing against. If the number is equal, then move to check the next number to the right. For example, to test if 5.7.23 is less than or equal to 5.8.0 you first compare 5 to 5. They are equal so you move on to compare 7 to 8. 7 is less than 8 so the entire test succeeds and 5.7.23 is 'less than or equal' to 5.8.0. The difference between the 'less than' and 'less than or equal' operations is how the last number is handled. If the last number is reached, the check should use the given operation (either 'less than' and 'less than or equal') to test the number. For example, to test if 4.23.6 is greater than 4.23.6 you first compare 4 to 4. They are equal so you move on to compare 23 to 23. They are equal so you move on to compare 6 to 6. This is the last number in the version and since 6 is not greater than 6, the entire test fails and 4.23.6 is not greater than 4.23.6.</xsd:documentation>
<xsd:documentation>Version strings with a different number of components shall be padded with zeros to make them the same size. For example, if the version strings '1.2.3' and '6.7.8.9' are being compared, then the short one should be padded to become '1.2.3.0'.</xsd:documentation>
</xsd:annotation>
More information about the Oval-commits
mailing list