[Sblim-commit] indication_helper ind_helper.c,1.7,1.8 ind_helper.h,1.3,1.4

[Konrad R. <kon...@us...>]

Update of /cvsroot/sblim/indication_helper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4581

Modified Files:
	ind_helper.c ind_helper.h 
Log Message:
BUG#: 1199129 (	Providers won't compile with CMPI 1.0)
Porting ind_helper library to CMPI 1.00 spec.
Changing spelling of BEHAVIOUR to BEHAVIOR


Index: ind_helper.h
===================================================================
RCS file: /cvsroot/sblim/indication_helper/ind_helper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ind_helper.h	11 May 2005 14:07:06 -0000	1.3
+++ ind_helper.h	17 May 2005 17:20:31 -0000	1.4
@@ -75,7 +75,7 @@
 check_os);
 
 */
-#define IND_BEHAVIOUR_LEVEL_EDGE 32
+#define IND_BEHAVIOR_LEVEL_EDGE 32
 
 /*
 The polling function (defined as the <li>check</li) will
@@ -119,7 +119,7 @@
 
 */
 
-#define IND_BEHAVIOUR_AGAINST_ZERO 64
+#define IND_BEHAVIOR_AGAINST_ZERO 64
 /**
  * Return codes.
  */

Index: ind_helper.c
===================================================================
RCS file: /cvsroot/sblim/indication_helper/ind_helper.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ind_helper.c	19 Apr 2005 16:04:15 -0000	1.7
+++ ind_helper.c	17 May 2005 17:20:22 -0000	1.8
@@ -42,7 +42,7 @@
 
 #define DEFAULT_NAMESPACE "root/cimv2"
 
-#define IND_BEHAVIOUR_NONE 0
+#define IND_BEHAVIOR_NONE 0
 /* 
  * Flags used in ind_class_property.flag value 
  */
@@ -422,7 +422,7 @@
                     char *pn, IndErrorT (*getAlertProperty) (CMPIData *))
 {
   return _addProperty (&ind_class_properties, ns,
-                       ci, pn, getAlertProperty, 0, IND_BEHAVIOUR_NONE, NULL);
+                       ci, pn, getAlertProperty, 0, IND_BEHAVIOR_NONE, NULL);
 
 }
 
@@ -432,7 +432,7 @@
 
   /* First we must add it */
   _addProperty (&ind_class_properties, ns,
-                cn, pn, NULL, 0, IND_BEHAVIOUR_NONE, NULL);
+                cn, pn, NULL, 0, IND_BEHAVIOR_NONE, NULL);
 
   return _modifyProperty (&ind_class_properties, ns,
                           cn, pn, CHANGE_DATA, 0, NULL, d);
@@ -668,7 +668,7 @@
 
   rc = _addProperty (&ind_filters, ns, ci, CMGetCharPtr (filter_str), NULL,     /* No function */
                      0,         /* No timer */
-                     IND_BEHAVIOUR_NONE,        /* No logic */
+                     IND_BEHAVIOR_NONE,        /* No logic */
                      filter);
 
   IND_HLP_DEBUG ("ind_set_select exited.");
@@ -1145,13 +1145,13 @@
                         }
 
                       /* There are two mechanism to do the logic comparison: 
-                         IND_BEHAVIOUR_LEVEL_EDGE
-                         IND_BEHAVIOUR_AGAINST_ZERO
+                         IND_BEHAVIOR_LEVEL_EDGE
+                         IND_BEHAVIOR_AGAINST_ZERO
                        */
-                      if (p->logic == IND_BEHAVIOUR_AGAINST_ZERO)
+                      if (p->logic == IND_BEHAVIOR_AGAINST_ZERO)
                         {
                           IND_HLP_DEBUG
-                            ("Logic is IND_BEHAVIOUR_AGAINST_ZERO");
+                            ("Logic is IND_BEHAVIOR_AGAINST_ZERO");
                           if ((p->flag & FIRST_TIME) == FIRST_TIME)
                             {
                               /* No need for this anymore. Remove it */
@@ -1174,7 +1174,7 @@
                         }
                       else
                         {
-                          IND_HLP_DEBUG ("Logic is IND_BEHAVIOUR_LEVEL_EDGE");
+                          IND_HLP_DEBUG ("Logic is IND_BEHAVIOR_LEVEL_EDGE");
                         }
                       if ((_compareCIMValue (data, p->data) != 0))
                         {       /* Yeey, data changed! */
@@ -1182,7 +1182,7 @@
                           IND_HLP_DEBUG
                             ("Yeey, data changed! Generate indication.\n");
 
-                          if (p->logic == IND_BEHAVIOUR_LEVEL_EDGE)
+                          if (p->logic == IND_BEHAVIOR_LEVEL_EDGE)
                             {
                               /* Only keep the past property values if LEVEL_EDGE is used */
                               _releaseData (&p->data);
@@ -1415,7 +1415,7 @@
 
   /* Set each individual entry */
   property->flag = UNLOCK;
-  if (logic == IND_BEHAVIOUR_AGAINST_ZERO)
+  if (logic == IND_BEHAVIOR_AGAINST_ZERO)
     property->flag |= FIRST_TIME;
 
   property->logic = logic;
@@ -1466,9 +1466,9 @@
       data.type = CMPI_null;
       data.state = CMPI_nullValue;
       /* We do not need to call the check function if our
-         logic is using IND_BEHAVIOUR_AGAINST_ZERO to get the
+         logic is using IND_BEHAVIOR_AGAINST_ZERO to get the
          previous value. */
-      if (logic == IND_BEHAVIOUR_LEVEL_EDGE)
+      if (logic == IND_BEHAVIOR_LEVEL_EDGE)
         {
           if ((rc = check (&data)) != IND_OK)
             {
@@ -1476,7 +1476,7 @@
               goto exit_error;
             }
           /* This is where the data is copied in-to memory */
-          /* Not needed when the logic is IND_BEHAVIOUR_AGAINST_ZERO here, as
+          /* Not needed when the logic is IND_BEHAVIOR_AGAINST_ZERO here, as
              the _worker will call the check function and then populate the
              property->data */
           if ((rc = _cloneData (&property->data, &data)) != IND_OK)