[Oval-commits] r320 - trunk/ovalint/debian/patches
Pavel Vinogradov
blaze-guest at alioth.debian.org
Wed Jan 23 20:44:08 UTC 2008
Author: blaze-guest
Date: 2008-01-23 20:44:08 +0000 (Wed, 23 Jan 2008)
New Revision: 320
Modified:
trunk/ovalint/debian/patches/oval.misc.patch
Log:
Update misk patch. Many parts integrated in upstream
Modified: trunk/ovalint/debian/patches/oval.misc.patch
===================================================================
--- trunk/ovalint/debian/patches/oval.misc.patch 2008-01-23 20:15:59 UTC (rev 319)
+++ trunk/ovalint/debian/patches/oval.misc.patch 2008-01-23 20:44:08 UTC (rev 320)
@@ -1,384 +1,15 @@
-diff -urN oval-ref/src/AbsCriteria.h oval-ref-misc/src/AbsCriteria.h
---- oval-ref/src/AbsCriteria.h 2007-06-22 19:03:41.000000000 +0500
-+++ oval-ref-misc/src/AbsCriteria.h 2007-08-06 16:08:39.000000000 +0500
-@@ -65,7 +65,7 @@
- class AbsCriteria {
-
- public :
-- /** Create a compelete AbsCriteria object.
-+ /** Create a complete AbsCriteria object.
- All paremters are initialized with default values.
- Default values are: negate = false; result = error
- */
-diff -urN oval-ref/src/AbsFunctionComponent.cpp oval-ref-misc/src/AbsFunctionComponent.cpp
---- oval-ref/src/AbsFunctionComponent.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/AbsFunctionComponent.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
+diff -urN ovalint-5.3/src/ItemEntity.cpp ovalint-5.3-debian/src/ItemEntity.cpp
+--- ovalint-5.3/src/ItemEntity.cpp 2008-01-02 21:39:07.000000000 +0400
++++ ovalint-5.3-debian/src/ItemEntity.cpp 2008-01-24 00:34:33.000000000 +0400
+@@ -131,7 +131,7 @@
// -----------------------------------------------------------------------
// Abstract
//
-- // Create a compelete AbsFunctionComponent object
-+ // Create a complete AbsFunctionComponent object
+- // Set the isObjectEntity field's value
++ // Return the isObjectEntity field's value
//
// -----------------------------------------------------------------------
-diff -urN oval-ref/src/AbsObject.cpp oval-ref-misc/src/AbsObject.cpp
---- oval-ref/src/AbsObject.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/AbsObject.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete Entity object
-+ // Create a complete Entity object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/AbsState.cpp oval-ref-misc/src/AbsState.cpp
---- oval-ref/src/AbsState.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/AbsState.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
-
-@@ -53,7 +53,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/AbsVariable.cpp oval-ref-misc/src/AbsVariable.cpp
---- oval-ref/src/AbsVariable.cpp 2007-06-22 21:36:16.000000000 +0500
-+++ oval-ref-misc/src/AbsVariable.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -40,7 +40,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete Entity object
-+ // Create a complete Entity object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/Behavior.h oval-ref-misc/src/Behavior.h
---- oval-ref/src/Behavior.h 2007-01-11 22:14:16.000000000 +0400
-+++ oval-ref-misc/src/Behavior.h 2007-08-06 16:08:39.000000000 +0500
-@@ -56,12 +56,12 @@
- typedef vector < Behavior*, allocator<Behavior*> > BehaviorVector;
-
- /**
-- This class represents a behavior in teh oval definition schema
-+ This class represents a behavior in the oval definition schema
- Behaviors are used by objects to refine data collection.
- */
- class Behavior {
- public:
-- /** Create a compelete Behavior object. */
-+ /** Create a complete Behavior object. */
- Behavior(string name = "", string value = "");
- ~Behavior();
-
-diff -urN oval-ref/src/CollectedObject.cpp oval-ref-misc/src/CollectedObject.cpp
---- oval-ref/src/CollectedObject.cpp 2007-06-22 19:12:43.000000000 +0500
-+++ oval-ref-misc/src/CollectedObject.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -41,7 +41,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete CollectedObject object
-+ // Create a complete CollectedObject object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/ComponentValue.cpp oval-ref-misc/src/ComponentValue.cpp
---- oval-ref/src/ComponentValue.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/ComponentValue.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ComponentValue object
-+ // Create a complete ComponentValue object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/ConcatFunction.cpp oval-ref-misc/src/ConcatFunction.cpp
---- oval-ref/src/ConcatFunction.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/ConcatFunction.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -15,7 +15,7 @@
- // materials provided with the distribution.
- // * Neither the name of The MITRE Corporation nor the names of its contributors may be
- // used to endorse or promote products derived from this software without specific
--// prior written permission.
-+// prior written pemission.
- //
- // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ConcatFunction object
-+ // Create a complete ConcatFunction object
- //
- // -----------------------------------------------------------------------
- }
-diff -urN oval-ref/src/ConstantVariable.cpp oval-ref-misc/src/ConstantVariable.cpp
---- oval-ref/src/ConstantVariable.cpp 2007-06-22 19:12:09.000000000 +0500
-+++ oval-ref-misc/src/ConstantVariable.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ConstantVariable
-+ // Create a complete ConstantVariable
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/Criteria.cpp oval-ref-misc/src/Criteria.cpp
---- oval-ref/src/Criteria.cpp 2007-03-29 23:11:35.000000000 +0500
-+++ oval-ref-misc/src/Criteria.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete Criteria object
-+ // Create a complete Criteria object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/Criterion.h oval-ref-misc/src/Criterion.h
---- oval-ref/src/Criterion.h 2007-06-22 19:05:38.000000000 +0500
-+++ oval-ref-misc/src/Criterion.h 2007-08-06 16:08:39.000000000 +0500
-@@ -48,7 +48,7 @@
- class Criterion : public AbsCriteria {
-
- public:
-- /** Create a compelete Criterion object. */
-+ /** Create a complete Criterion object. */
- Criterion(bool negate = false, OvalEnum::ResultEnumeration result = OvalEnum::RESULT_ERROR, Test* testRef = NULL);
- /** Empty destructor. */
- ~Criterion();
-diff -urN oval-ref/src/Definition.cpp oval-ref-misc/src/Definition.cpp
---- oval-ref/src/Definition.cpp 2007-06-22 19:05:38.000000000 +0500
-+++ oval-ref-misc/src/Definition.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -41,7 +41,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete Definition object
-+ // Create a complete Definition object
- //
- // -----------------------------------------------------------------------
-
-@@ -106,7 +106,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return the id field's value
-+ // Set the id field's value
- //
- // -----------------------------------------------------------------------
-
-@@ -128,7 +128,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return the result field's value
-+ // Set the result field's value
- //
- // -----------------------------------------------------------------------
-
-@@ -150,7 +150,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return the variableInstance field's value
-+ // Set the variableInstance field's value
- //
- // -----------------------------------------------------------------------
-
-@@ -172,7 +172,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return the version field's value
-+ // Set the version field's value
- //
- // -----------------------------------------------------------------------
-
-@@ -194,7 +194,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return the written field's value
-+ // Set the written field's value
- //
- // -----------------------------------------------------------------------
-
-@@ -216,7 +216,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return the analyzed field's value
-+ // Set the analyzed field's value
- //
- // -----------------------------------------------------------------------
-
-@@ -255,7 +255,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // clear the cahce of processed defintions
-+ // clear the cache of processed defintions
- // -----------------------------------------------------------------------
-
- //Definition* def = NULL;
-diff -urN oval-ref/src/Exception.cpp oval-ref-misc/src/Exception.cpp
---- oval-ref/src/Exception.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/Exception.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // ABSTRACT
- //
-- // A simple constructor that sets the error message and the severity ot
-+ // A simple constructor that sets the error message and the severity of
- // this exception to the specified values
- //
- // -----------------------------------------------------------------------
-diff -urN oval-ref/src/ExtendedDefinition.cpp oval-ref-misc/src/ExtendedDefinition.cpp
---- oval-ref/src/ExtendedDefinition.cpp 2007-03-29 23:15:33.000000000 +0500
-+++ oval-ref-misc/src/ExtendedDefinition.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ExtendedDefinition object
-+ // Create a complete ExtendedDefinition object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/ExternalVariable.cpp oval-ref-misc/src/ExternalVariable.cpp
---- oval-ref/src/ExternalVariable.cpp 2007-06-22 19:12:09.000000000 +0500
-+++ oval-ref-misc/src/ExternalVariable.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ExternalVariable
-+ // Create a complete ExternalVariable
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/Filter.cpp oval-ref-misc/src/Filter.cpp
---- oval-ref/src/Filter.cpp 2007-06-22 19:13:33.000000000 +0500
-+++ oval-ref-misc/src/Filter.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -40,7 +40,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
-
-@@ -54,7 +54,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
-
-@@ -64,7 +64,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
-
-@@ -159,7 +159,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Parse the provided state from a defintion file into an Filter object
-+ // Parse the provided state from a definition file into an Filter object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/FilterEntity.cpp oval-ref-misc/src/FilterEntity.cpp
---- oval-ref/src/FilterEntity.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/FilterEntity.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // Abstract
- //
- // Copy constructor.
-- // Create a compelete FilterEntity object based on the specified obj.
-+ // Create a complete FilterEntity object based on the specified obj.
- //
- // -----------------------------------------------------------------------
-
-@@ -59,7 +59,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete FilterEntity object
-+ // Create a complete FilterEntity object
- //
- // -----------------------------------------------------------------------
-
-@@ -104,7 +104,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return true iff this FilterEntity is equal to the provided FilterEntity
-+ // Return true if this FilterEntity is equal to the provided FilterEntity
- // -----------------------------------------------------------------------
- FilterEntity* filterEntity = (FilterEntity*)entity;
- bool isEqual = false;
-diff -urN oval-ref/src/Item.cpp oval-ref-misc/src/Item.cpp
---- oval-ref/src/Item.cpp 2007-04-18 19:25:34.000000000 +0500
-+++ oval-ref-misc/src/Item.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -42,7 +42,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete Entity object
-+ // Create a complete Entity object
- //
- // -----------------------------------------------------------------------
-
-@@ -155,7 +155,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Set the messages field's value
-+ // Get the messages field's value
- //
- // -----------------------------------------------------------------------
- return &this->messages;
-diff -urN oval-ref/src/ItemEntity.cpp oval-ref-misc/src/ItemEntity.cpp
---- oval-ref/src/ItemEntity.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/ItemEntity.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ItemEntity object
-+ // Create a complete ItemEntity object
- //
- // -----------------------------------------------------------------------
-
@@ -175,7 +175,7 @@
// -----------------------------------------------------------------------
// Abstract
@@ -388,285 +19,9 @@
// Note: Status is not compared.
// -----------------------------------------------------------------------
-diff -urN oval-ref/src/Item.h oval-ref-misc/src/Item.h
---- oval-ref/src/Item.h 2007-06-22 19:12:09.000000000 +0500
-+++ oval-ref-misc/src/Item.h 2007-08-06 16:08:39.000000000 +0500
-@@ -81,7 +81,7 @@
- This class represents an Item in a sytem characteristics file.
- Items must be unique. The Item::Equals() method and the caching methods
- provided in this class should be utilized to ensure uniqueness. This class also
-- provides staticv methods for assigning Item ids.
-+ provides static methods for assigning Item ids.
- */
- class Item {
- public:
-diff -urN oval-ref/src/LiteralComponent.cpp oval-ref-misc/src/LiteralComponent.cpp
---- oval-ref/src/LiteralComponent.cpp 2007-06-22 19:12:09.000000000 +0500
-+++ oval-ref-misc/src/LiteralComponent.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete LiteralComponent object
-+ // Create a complete LiteralComponent object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/LocalVariable.cpp oval-ref-misc/src/LocalVariable.cpp
---- oval-ref/src/LocalVariable.cpp 2007-06-22 19:12:09.000000000 +0500
-+++ oval-ref-misc/src/LocalVariable.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete LocalVariable
-+ // Create a complete LocalVariable
- //
- // -----------------------------------------------------------------------
-
-@@ -93,7 +93,7 @@
- // set the error message for this varaible
- this->AppendMessages(value->GetMessages());
-
-- // if flag is compelete or incomplete create VariableValues for each value.
-+ // if flag is complete or incomplete create VariableValues for each value.
- if(value->GetFlag() == OvalEnum::FLAG_COMPLETE || value->GetFlag() == OvalEnum::FLAG_INCOMPLETE) {
- StringVector::iterator iterator;
- for(iterator = value->GetValues()->begin(); iterator != value->GetValues()->end(); iterator++) {
-diff -urN oval-ref/src/Main.cpp oval-ref-misc/src/Main.cpp
---- oval-ref/src/Main.cpp 2007-06-28 21:02:55.000000000 +0500
-+++ oval-ref-misc/src/Main.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -685,7 +685,7 @@
- //------------------------------------------------------------------------------------//
-
- cout << endl;
-- cout << "Command Line: >ovaldi [option] MD5Hash" << endl;
-+ cout << "Command Line: ovaldi [option] MD5Hash" << endl;
- cout << endl;
- cout << "Options:" << endl;
- cout << " -h = show options available from command line" << endl;
-@@ -698,7 +698,7 @@
- cout << "\n";
- cout << " -i <string> = use data from input System Characteristics file" << endl;
- cout << "\n";
-- cout << " -n = perform Schematron validation of the oval-defiitions file." << endl;
-+ cout << " -n = perform Schematron validation of the oval-definitions file." << endl;
- cout << " -c <string> = use the specified xsl for oval-definitions Schematron validation. DEFAULT=\"oval-definitions-schematron.xsl\"" << endl;
- cout << "\n";
- cout << " -m = do not verify the oval.xml file with an MD5 hash" << endl;
-diff -urN oval-ref/src/ObjectComponent.cpp oval-ref-misc/src/ObjectComponent.cpp
---- oval-ref/src/ObjectComponent.cpp 2007-06-22 19:11:50.000000000 +0500
-+++ oval-ref-misc/src/ObjectComponent.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ObjectComponent object
-+ // Create a complete ObjectComponent object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/Object.cpp oval-ref-misc/src/Object.cpp
---- oval-ref/src/Object.cpp 2007-04-18 19:25:34.000000000 +0500
-+++ oval-ref-misc/src/Object.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete object
-+ // Create a complete object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/ObjectEntity.cpp oval-ref-misc/src/ObjectEntity.cpp
---- oval-ref/src/ObjectEntity.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/ObjectEntity.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // Abstract
- //
- // Copy constructor.
-- // Create a compelete ObjectEntity object based on the specified obj.
-+ // Create a complete ObjectEntity object based on the specified obj.
- //
- // -----------------------------------------------------------------------
-
-@@ -58,7 +58,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete ObjectEntity object
-+ // Create a complete ObjectEntity object
- //
- // -----------------------------------------------------------------------
- }
-@@ -79,7 +79,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return true iff this ObjectEntity is equal to the provided ObjectEntity
-+ // Return true if this ObjectEntity is equal to the provided ObjectEntity
- // -----------------------------------------------------------------------
- ObjectEntity* objectEntity = (ObjectEntity*)entity;
- bool isEqual = false;
-diff -urN oval-ref/src/OvalMessage.cpp oval-ref-misc/src/OvalMessage.cpp
---- oval-ref/src/OvalMessage.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/OvalMessage.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete OvalMessage object
-+ // Create a complete OvalMessage object
- //
- // -----------------------------------------------------------------------
-
-@@ -106,7 +106,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Set the Level field's value
-+ // Make string representation of object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/RestrictionType.cpp oval-ref-misc/src/RestrictionType.cpp
---- oval-ref/src/RestrictionType.cpp 2007-06-22 19:08:57.000000000 +0500
-+++ oval-ref-misc/src/RestrictionType.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete RestrictionType
-+ // Create a complete RestrictionType
- //
- // -----------------------------------------------------------------------
- this->datatype = datatype;
-diff -urN oval-ref/src/SetObject.cpp oval-ref-misc/src/SetObject.cpp
---- oval-ref/src/SetObject.cpp 2007-04-18 19:25:34.000000000 +0500
-+++ oval-ref-misc/src/SetObject.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete SetObject
-+ // Create a complete SetObject
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/State.cpp oval-ref-misc/src/State.cpp
---- oval-ref/src/State.cpp 2007-06-22 19:13:33.000000000 +0500
-+++ oval-ref-misc/src/State.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
-
-@@ -53,7 +53,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
- }
-@@ -62,7 +62,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete State object
-+ // Create a complete State object
- //
- // -----------------------------------------------------------------------
- }
-@@ -71,7 +71,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // AbsState class handles deleteing all elements
-+ // AbsState class handles deleting all elements
- // -----------------------------------------------------------------------
- }
-
-diff -urN oval-ref/src/StateEntity.cpp oval-ref-misc/src/StateEntity.cpp
---- oval-ref/src/StateEntity.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/StateEntity.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -39,7 +39,7 @@
- // Abstract
- //
- // Copy constructor.
-- // Create a compelete StateEntity object based on the specified obj.
-+ // Create a complete StateEntity object based on the specified obj.
- //
- // -----------------------------------------------------------------------
-
-@@ -59,7 +59,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete StateEntity object
-+ // Create a complete StateEntity object
- //
- // -----------------------------------------------------------------------
-
-@@ -104,7 +104,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return true iff this StateEntity is equal to the provided StateEntity
-+ // Return true if this StateEntity is equal to the provided StateEntity
- // -----------------------------------------------------------------------
- StateEntity* stateEntity = (StateEntity*)entity;
- bool isEqual = false;
-diff -urN oval-ref/src/State.h oval-ref-misc/src/State.h
---- oval-ref/src/State.h 2007-06-22 19:13:33.000000000 +0500
-+++ oval-ref-misc/src/State.h 2007-08-06 16:08:39.000000000 +0500
-@@ -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 {
-diff -urN oval-ref/src/SubstringFunction.cpp oval-ref-misc/src/SubstringFunction.cpp
---- oval-ref/src/SubstringFunction.cpp 2007-06-22 19:10:55.000000000 +0500
-+++ oval-ref-misc/src/SubstringFunction.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete Component object
-+ // Create a complete Component object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/TestedItem.cpp oval-ref-misc/src/TestedItem.cpp
---- oval-ref/src/TestedItem.cpp 2007-06-22 19:13:33.000000000 +0500
-+++ oval-ref-misc/src/TestedItem.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete Test object
-+ // Create a complete Test object
- //
- // -----------------------------------------------------------------------
-
-@@ -74,7 +74,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Return the item field's value
-+ // Set the item field's value
- //
- // -----------------------------------------------------------------------
-
+diff -urN ovalint-5.3/src/TestedItem.cpp ovalint-5.3-debian/src/TestedItem.cpp
+--- ovalint-5.3/src/TestedItem.cpp 2008-01-02 21:39:07.000000000 +0400
++++ ovalint-5.3-debian/src/TestedItem.cpp 2008-01-24 00:39:13.000000000 +0400
@@ -96,7 +96,7 @@
// -----------------------------------------------------------------------
// Abstract
@@ -676,93 +31,12 @@
//
// -----------------------------------------------------------------------
-diff -urN oval-ref/src/Test.h oval-ref-misc/src/Test.h
---- oval-ref/src/Test.h 2007-06-22 20:37:13.000000000 +0500
-+++ oval-ref-misc/src/Test.h 2007-08-06 16:08:39.000000000 +0500
-@@ -65,7 +65,7 @@
- class Test {
-
- public:
-- /** Create a compelete Test object **/
-+ /** Create a complete Test object **/
- Test();
- ~Test();
-
-diff -urN oval-ref/src/VariableComponent.cpp oval-ref-misc/src/VariableComponent.cpp
---- oval-ref/src/VariableComponent.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/VariableComponent.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -38,7 +38,7 @@
+@@ -126,7 +126,7 @@
// -----------------------------------------------------------------------
// Abstract
//
-- // Create a compelete VariableComponent object
-+ // Create a complete VariableComponent object
+- // parses itme elm to a Item obj
++ // parses item elm to a Item obj
//
// -----------------------------------------------------------------------
-
-diff -urN oval-ref/src/VariableValue.cpp oval-ref-misc/src/VariableValue.cpp
---- oval-ref/src/VariableValue.cpp 2007-01-09 21:43:02.000000000 +0400
-+++ oval-ref-misc/src/VariableValue.cpp 2007-08-06 16:08:39.000000000 +0500
-@@ -40,7 +40,7 @@
- // -----------------------------------------------------------------------
- // Abstract
- //
-- // Create a compelete VariableValue object
-+ // Create a complete VariableValue object
- //
- // -----------------------------------------------------------------------
-
-diff -urN oval-ref/xml/oval-common-schema.xsd oval-ref-misc/xml/oval-common-schema.xsd
---- oval-ref/xml/oval-common-schema.xsd 2007-06-26 01:01:12.000000000 +0500
-+++ oval-ref-misc/xml/oval-common-schema.xsd 2007-08-06 16:08:24.000000000 +0500
-@@ -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>
+ Item* item = new Item();
More information about the Oval-commits
mailing list