Menu
▾
▴
[Openhpi-svn] SF.net SVN: openhpi:[7227] openhpi/trunk
|
From: <av...@us...> - 2010-12-24 17:29:51
|
Revision: 7227
http://openhpi.svn.sourceforge.net/openhpi/?rev=7227&view=rev
Author: avpak
Date: 2010-12-24 17:29:43 +0000 (Fri, 24 Dec 2010)
Log Message:
-----------
More on Feature Request #1531430
Modified Paths:
--------------
openhpi/trunk/openhpid/t/ohpi/ohpi_035.c
openhpi/trunk/utils/t/ann/ann_test_001.c
openhpi/trunk/utils/t/ann/ann_test_002.c
openhpi/trunk/utils/t/ann/ann_test_003.c
openhpi/trunk/utils/t/ann/ann_test_004.c
openhpi/trunk/utils/t/ann/ann_test_005.c
openhpi/trunk/utils/t/ann/ann_test_006.c
openhpi/trunk/utils/t/ann/ann_test_007.c
openhpi/trunk/utils/t/ann/ann_test_008.c
openhpi/trunk/utils/t/el/el_compare.c
openhpi/trunk/utils/t/el/el_test_001.c
openhpi/trunk/utils/t/el/el_test_002.c
openhpi/trunk/utils/t/el/el_test_003.c
openhpi/trunk/utils/t/el/el_test_004.c
openhpi/trunk/utils/t/el/el_test_005.c
openhpi/trunk/utils/t/el/el_test_006.c
openhpi/trunk/utils/t/el/el_test_007.c
openhpi/trunk/utils/t/el/el_test_008.c
openhpi/trunk/utils/t/el/el_test_009.c
openhpi/trunk/utils/t/el/el_test_010.c
openhpi/trunk/utils/t/el/el_test_011.c
openhpi/trunk/utils/t/el/el_test_012.c
openhpi/trunk/utils/t/el/el_test_013.c
openhpi/trunk/utils/t/el/el_test_014.c
openhpi/trunk/utils/t/el/el_test_015.c
openhpi/trunk/utils/t/el/el_test_016.c
openhpi/trunk/utils/t/el/el_test_017.c
openhpi/trunk/utils/t/el/el_test_018.c
openhpi/trunk/utils/t/el/el_test_019.c
openhpi/trunk/utils/t/el/el_test_020.c
openhpi/trunk/utils/t/el/el_test_021.c
openhpi/trunk/utils/t/el/el_test_022.c
openhpi/trunk/utils/t/el/el_test_023.c
openhpi/trunk/utils/t/el/el_test_024.c
openhpi/trunk/utils/t/el/el_test_025.c
openhpi/trunk/utils/t/el/el_test_026.c
openhpi/trunk/utils/t/el/el_test_027.c
openhpi/trunk/utils/t/el/el_test_028.c
openhpi/trunk/utils/t/el/el_test_029.c
openhpi/trunk/utils/t/el/el_test_030.c
openhpi/trunk/utils/t/el/el_test_031.c
openhpi/trunk/utils/t/el/el_test_032.c
openhpi/trunk/utils/t/el/el_test_033.c
openhpi/trunk/utils/t/el/el_test_034.c
openhpi/trunk/utils/t/el/el_test_035.c
openhpi/trunk/utils/t/el/el_test_036.c
openhpi/trunk/utils/t/el/el_test_037.c
openhpi/trunk/utils/t/el/el_test_038.c
openhpi/trunk/utils/t/el/el_test_039.c
openhpi/trunk/utils/t/el/el_test_040.c
openhpi/trunk/utils/t/el/el_test_041.c
openhpi/trunk/utils/t/el/el_test_042.c
openhpi/trunk/utils/t/el/el_test_043.c
openhpi/trunk/utils/t/el/el_test_044.c
openhpi/trunk/utils/t/el/el_test_045.c
openhpi/trunk/utils/t/sahpi/sahpi_text_utils_test.c
Modified: openhpi/trunk/openhpid/t/ohpi/ohpi_035.c
===================================================================
--- openhpi/trunk/openhpid/t/ohpi/ohpi_035.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/openhpid/t/ohpi/ohpi_035.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -13,6 +13,7 @@
* Renier Morales <re...@op...>
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <SaHpi.h>
Modified: openhpi/trunk/utils/t/ann/ann_test_001.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_001.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_001.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -39,18 +39,18 @@
ann = oh_announcement_create();
if(ann == NULL) {
- err("ERROR: ann pointer == NULL.");
+ CRIT("ann pointer == NULL.");
return 1;
}
if(ann->nextId != SAHPI_OLDEST_ENTRY + 1) {
- err("ERROR: ann->nextId invalid.");
+ CRIT("ann->nextId invalid.");
return 1;
}
if(ann->annentries != NULL) {
- err("ERROR: ann->annentries invalid.");
+ CRIT("ann->annentries invalid.");
return 1;
}
Modified: openhpi/trunk/utils/t/ann/ann_test_002.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_002.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_002.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -62,12 +62,12 @@
rc = oh_announcement_append(ann, &announ);
if(ann->nextId != SAHPI_OLDEST_ENTRY + 2) {
- err("ERROR: ann->nextId invalid.");
+ CRIT("ann->nextId invalid.");
return 1;
}
if(ann->annentries == NULL) {
- err("ERROR: ann->annentries invalid.");
+ CRIT("ann->annentries invalid.");
return 1;
}
Modified: openhpi/trunk/utils/t/ann/ann_test_003.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_003.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_003.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -68,12 +68,12 @@
rc = oh_announcement_append(ann, &announ);
if(ann->nextId != SAHPI_OLDEST_ENTRY + 4) {
- err("ERROR: ann->nextId invalid.");
+ CRIT("ann->nextId invalid.");
return 1;
}
if(ann->annentries == NULL) {
- err("ERROR: ann->annentries invalid.");
+ CRIT("ann->annentries invalid.");
return 1;
}
Modified: openhpi/trunk/utils/t/ann/ann_test_004.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_004.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_004.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -70,12 +70,12 @@
rc = oh_announcement_get(ann, 2, &announ);
if(announ.EntryId != 2) {
- err("ERROR: announ.EntryId invalid.");
+ CRIT("announ.EntryId invalid.");
return 1;
}
if(announ.Severity != SAHPI_MAJOR) {
- err("ERROR: announ.Severity invalid.");
+ CRIT("announ.Severity invalid.");
return 1;
}
Modified: openhpi/trunk/utils/t/ann/ann_test_005.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_005.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_005.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -62,28 +62,28 @@
rc = oh_announcement_append(ann, &announ);
if (rc != SA_OK) {
- err("ERROR: 1 oh_announcement_append failed.");
+ CRIT("1 oh_announcement_append failed.");
return 1;
}
announ.Severity = SAHPI_MAJOR;
rc = oh_announcement_append(ann, &announ);
if (rc != SA_OK) {
- err("ERROR: 2 oh_announcement_append failed.");
+ CRIT("2 oh_announcement_append failed.");
return 1;
}
announ.Severity = SAHPI_MINOR;
rc = oh_announcement_append(ann, &announ);
if (rc != SA_OK) {
- err("ERROR: 3 oh_announcement_append failed.");
+ CRIT("3 oh_announcement_append failed.");
return 1;
}
announ.Severity = SAHPI_CRITICAL;
rc = oh_announcement_append(ann, &announ);
if (rc != SA_OK) {
- err("ERROR: 4 oh_announcement_append failed.");
+ CRIT("4 oh_announcement_append failed.");
return 1;
}
@@ -91,31 +91,31 @@
announ.Timestamp = 0;
rc = oh_announcement_get_next(ann, SAHPI_ALL_SEVERITIES, FALSE, &announ);
if(rc != SA_OK) {
- err("ERROR: on_announcement_get_next returned %d.", rc);
+ CRIT("on_announcement_get_next returned %d.", rc);
return 1;
}
- err("EntryId %d returned with Severity %d.", announ.EntryId, announ.Severity);
+ CRIT("EntryId %d returned with Severity %d.", announ.EntryId, announ.Severity);
rc = oh_announcement_get_next(ann, SAHPI_ALL_SEVERITIES, FALSE, &announ);
if(rc != SA_OK) {
- err("ERROR: on_announcement_get_next returned %d.", rc);
+ CRIT("on_announcement_get_next returned %d.", rc);
return 1;
}
- err("EntryId %d returned with Severity %d.", announ.EntryId, announ.Severity);
+ CRIT("EntryId %d returned with Severity %d.", announ.EntryId, announ.Severity);
rc = oh_announcement_get(ann, 1, &announ);
if (rc != SA_OK) {
- err("ERROR: oh_announcement_get did not find anything.");
+ CRIT("oh_announcement_get did not find anything.");
return 1;
}
rc = oh_announcement_get_next(ann, SAHPI_CRITICAL, FALSE, &announ);
if(rc != SA_OK || announ.Severity != SAHPI_CRITICAL) {
- err("ERROR: on_announcement_get_next returned %d."
+ CRIT("on_announcement_get_next returned %d."
" Severity returned is %d. EntryId %d.",
rc, announ.Severity, announ.EntryId);
return 1;
}
- err("EntryId %d returned.", announ.EntryId);
+ CRIT("EntryId %d returned.", announ.EntryId);
return 0;
}
Modified: openhpi/trunk/utils/t/ann/ann_test_006.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_006.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_006.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -69,17 +69,17 @@
rc = oh_announcement_ack(ann, 2, SAHPI_MAJOR);
if(rc != SA_OK) {
- err("ERROR: on_announcement_ack returned %d.", rc);
+ CRIT("on_announcement_ack returned %d.", rc);
return 1;
}
rc = oh_announcement_get(ann, 2, &announ);
if(rc != SA_OK) {
- err("ERROR: on_announcement_get returned %d.", rc);
+ CRIT("on_announcement_get returned %d.", rc);
return 1;
}
if(announ.Acknowledged != TRUE) {
- err("ERROR: announ.Acknowledged invalid");
+ CRIT("announ.Acknowledged invalid");
return 1;
}
Modified: openhpi/trunk/utils/t/ann/ann_test_007.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_007.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_007.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -69,11 +69,11 @@
rc = oh_announcement_del(ann, 2, SAHPI_MAJOR);
if(rc != SA_OK) {
- err("ERROR: on_announcement_del returned %d.", rc);
+ CRIT("on_announcement_del returned %d.", rc);
return 1;
}
if(g_list_length(ann->annentries) != 2) {
- err("ERROR: invalid number of announcements in list.");
+ CRIT("invalid number of announcements in list.");
return 1;
}
Modified: openhpi/trunk/utils/t/ann/ann_test_008.c
===================================================================
--- openhpi/trunk/utils/t/ann/ann_test_008.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/ann/ann_test_008.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -69,7 +69,7 @@
rc = oh_announcement_close(ann);
if(rc != SA_OK) {
- err("ERROR: on_announcement_close returned %d.", rc);
+ CRIT("on_announcement_close returned %d.", rc);
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_compare.c
===================================================================
--- openhpi/trunk/utils/t/el/el_compare.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_compare.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -16,7 +16,7 @@
SaErrorT retc;
if (g_list_length(el1->list) != g_list_length(el2->list)) {
- err("ERROR: el1->list != el2->list.");
+ CRIT("el1->list != el2->list.");
return 1;
}
@@ -34,31 +34,31 @@
/* fetch the event for el1*/
retc = oh_el_get(el1, cur1, &prev1, &next1, &entry1);
if (retc != SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
/* fetch the event for el2*/
retc = oh_el_get(el2, cur2, &prev2, &next2, &entry2);
if (retc != SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
if (memcmp(&entry1->event.Event, &entry2->event.Event, sizeof(SaHpiEventT))) {
- err("ERROR: Data from el1 and el2 do not match");
+ CRIT("Data from el1 and el2 do not match");
return 1;
}
/* Compare resource from el1 and el2 */
if (memcmp(&entry1->res, &entry2->res, sizeof(SaHpiRptEntryT))) {
- err("ERROR: Res from el1 and el2 do not match.");
+ CRIT("Res from el1 and el2 do not match.");
return 1;
}
/* Compare rdr from el1 and el2 */
if (memcmp(&entry1->rdr, &entry2->rdr, sizeof(SaHpiRdrT))) {
- err("ERROR: Rdr from el1 and el2 do not match.");
+ CRIT("Rdr from el1 and el2 do not match.");
return 1;
}
}
Modified: openhpi/trunk/utils/t/el/el_test_001.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_001.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_001.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -22,6 +22,7 @@
#include <unistd.h>
#include <SaHpi.h>
+#include <oh_error.h>
#include <oh_utils.h>
@@ -39,42 +40,42 @@
el = oh_el_create(5);
if(el == NULL) {
- err("ERROR: el pointer == NULL.");
+ CRIT("el pointer == NULL.");
return 1;
}
if(el->info.Enabled != TRUE) {
- err("ERROR: el->info.Enabled invalid.");
+ CRIT("el->info.Enabled invalid.");
return 1;
}
if(el->info.OverflowFlag != FALSE) {
- err("ERROR: el->info.OverflowFlag invalid.");
+ CRIT("el->info.OverflowFlag invalid.");
return 1;
}
if(el->info.UpdateTimestamp != SAHPI_TIME_UNSPECIFIED) {
- err("ERROR: el->info.UpdateTimestamp invalid.");
+ CRIT("el->info.UpdateTimestamp invalid.");
return 1;
}
if(el->basetime != 0) {
- err("ERROR: el->basetime invalid.");
+ CRIT("el->basetime invalid.");
return 1;
}
if(el->nextid != SAHPI_OLDEST_ENTRY + 1) {
- err("ERROR: el->nextid invalid.");
+ CRIT("el->nextid invalid.");
return 1;
}
if(el->info.Size != 5) {
- err("ERROR: el->info.Size invalid.");
+ CRIT("el->info.Size invalid.");
return 1;
}
if(el->list != NULL) {
- err("ERROR: el->list invalid.");
+ CRIT("el->list invalid.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_002.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_002.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_002.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -50,7 +50,7 @@
el = oh_el_create(5);
if(el == NULL) {
- err("ERROR: el == NULL.");
+ CRIT("el == NULL.");
return 1;
}
@@ -64,33 +64,33 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
entry = (oh_el_entry *)(g_list_first(el->list)->data);
if(g_list_length(el->list) != 1){
- err("ERROR: g_list_length does not return the correct number of entries.");
+ CRIT("g_list_length does not return the correct number of entries.");
return 1;
}
/* fetch the event for el*/
retc = oh_el_get(el, entry->event.EntryId, &prev, &next, &entry);
if (retc != SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
if (strcmp((char *)entry->event.Event.EventDataUnion.UserEvent.UserEventData.Data, data[0])) {
- err("ERROR: Data from el and what was entered into el do not match");
+ CRIT("Data from el and what was entered into el do not match");
return 1;
}
/* close the EL */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close failed.");
+ CRIT("oh_el_close failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_003.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_003.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_003.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -64,13 +64,13 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
if(g_list_length(el->list) != 5){
- err("ERROR: g_list_length does not hold the correct number of entries.");
+ CRIT("g_list_length does not hold the correct number of entries.");
return 1;
}
@@ -78,12 +78,12 @@
for(x=0; curr != SAHPI_NO_MORE_ENTRIES; x++){
retc = oh_el_get(el, curr, &prev, &next, &entry);
if (retc != SA_OK){
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
if (strcmp((char *)entry->event.Event.EventDataUnion.UserEvent.UserEventData.Data, data[x])){
- err("ERROR: Data from el and original data do not match");
+ CRIT("Data from el and original data do not match");
return 1;
}
curr = next;
@@ -92,7 +92,7 @@
/* close the el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close failed.");
+ CRIT("oh_el_close failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_004.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_004.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_004.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -65,7 +65,7 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
@@ -73,20 +73,20 @@
/* save the EL to file */
retc = oh_el_map_to_file(el, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_to_file failed.");
+ CRIT("oh_el_map_to_file failed.");
return 1;
}
/* get EL from file (el2) */
retc = oh_el_map_from_file(el2, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
if(g_list_length(el->list) != g_list_length(el2->list)) {
- err("ERROR: el->list != el2->list.");
+ CRIT("el->list != el2->list.");
return 1;
}
@@ -94,7 +94,7 @@
/* close the el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close failed.");
+ CRIT("oh_el_close failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_005.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_005.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_005.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -71,42 +71,42 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
/* save the EL to file */
retc = oh_el_map_to_file(el, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_to_file failed.");
+ CRIT("oh_el_map_to_file failed.");
return 1;
}
/* get EL from file (el2) */
retc2 = oh_el_map_from_file(el2, "./elTest.data");
if (retc2 != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
/* compare entry contents of el and el2 */
retc = el_compare(el,el2);
if (retc != SA_OK){
- err("ERROR: el and el2 do not have matching entries.");
+ CRIT("el and el2 do not have matching entries.");
return 1;
}
/* close el */
retc1 = oh_el_close(el);
if (retc1 != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
/* close el2 */
retc2 = oh_el_close(el2);
if (retc2 != SA_OK) {
- err("ERROR: oh_el_close on el2 failed.");
+ CRIT("oh_el_close on el2 failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_006.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_006.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_006.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -73,7 +73,7 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
@@ -82,7 +82,7 @@
/* save the EL to file */
retc1 = oh_el_map_to_file(el, "./elTest.data");
if (retc1 != SA_OK) {
- err("ERROR: oh_el_map_to_file failed.");
+ CRIT("oh_el_map_to_file failed.");
return 1;
}
@@ -90,7 +90,7 @@
/* get EL from file (el2) */
retc2 = oh_el_map_from_file(el2, "./elTest.data");
if (retc2 != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
@@ -104,7 +104,7 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
@@ -119,7 +119,7 @@
retc = oh_el_append(el2, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
@@ -127,33 +127,33 @@
/* verify number of entries in el and el2 is 10 */
if(g_list_length(el->list) != 10) {
- err("ERROR: el->list does not have the correct number of entries");
+ CRIT("el->list does not have the correct number of entries");
return 1;
}
if(g_list_length(el2->list) != 10) {
- err("ERROR: el2->list does not have the correct number of entries");
+ CRIT("el2->list does not have the correct number of entries");
return 1;
}
/* compare entry contents of el and el2 */
retc = el_compare(el,el2);
if (retc != SA_OK){
- err("ERROR: el and el2 do not have matching entries.");
+ CRIT("el and el2 do not have matching entries.");
return 1;
}
/* close el */
retc1 = oh_el_close(el);
if (retc1 != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
/* close el2 */
retc2 = oh_el_close(el2);
if (retc2 != SA_OK) {
- err("ERROR: oh_el_close on el2 failed.");
+ CRIT("oh_el_close on el2 failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_007.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_007.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_007.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -62,33 +62,33 @@
/* modifies the timestamp basetime */
retc = oh_el_timeset(el, timestamp);
if (retc != SA_OK){
- err("ERROR: timeset failed");
+ CRIT("timeset failed");
return 1;
}
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
/* get el info */
retc = oh_el_info(el, &info);
if (retc != SA_OK) {
- err("ERROR: oh_el_info failed.");
+ CRIT("oh_el_info failed.");
return 1;
}
/* Verifies timestamp basetime worked */
if (info.UpdateTimestamp < timestamp){
- err("ERROR: Timestamp basetime failed");
+ CRIT("Timestamp basetime failed");
return 1;
}
/* close el without saving to file*/
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_008.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_008.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_008.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -67,7 +67,7 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
@@ -76,20 +76,20 @@
/* clear the el */
retc = oh_el_clear(el);
if (retc != SA_OK) {
- err("ERROR: el clear failed.");
+ CRIT("el clear failed.");
return 1;
}
/* verify el list nodes are cleared */
if(el->list != NULL){
- err("ERROR: el clear failed.");
+ CRIT("el clear failed.");
return 1;
}
/* close el without saving to file*/
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_009.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_009.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_009.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -46,7 +46,7 @@
/* close el without saving to file*/
retc = oh_el_close(el);
if (retc == SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_010.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_010.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_010.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -58,7 +58,7 @@
/* get EL from file (el) */
retc = oh_el_map_from_file(el, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
@@ -73,7 +73,7 @@
retc = oh_el_prepend(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
@@ -81,7 +81,7 @@
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_011.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_011.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_011.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -59,7 +59,7 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_012.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_012.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_012.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -44,14 +44,14 @@
el = oh_el_create(20);
retc = oh_el_append(el, NULL, NULL, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_013.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_013.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_013.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -65,7 +65,7 @@
strcpy((char *) &event.EventDataUnion.UserEvent.UserEventData.Data, data[x]);
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
}
@@ -75,7 +75,7 @@
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_014.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_014.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_014.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -60,7 +60,7 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
@@ -68,7 +68,7 @@
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_015.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_015.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_015.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -60,14 +60,14 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_016.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_016.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_016.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -61,14 +61,14 @@
retc = oh_el_append(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_append failed.");
+ CRIT("oh_el_append failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_017.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_017.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_017.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -59,7 +59,7 @@
retc = oh_el_prepend(el, &event, NULL, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_prepend failed.");
+ CRIT("oh_el_prepend failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_018.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_018.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_018.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -44,14 +44,14 @@
retc = oh_el_prepend(el, NULL, NULL, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_prepend failed.");
+ CRIT("oh_el_prepend failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_019.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_019.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_019.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -51,14 +51,14 @@
retc = oh_el_prepend(el, &event, NULL, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_add failed.");
+ CRIT("oh_el_add failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_020.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_020.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_020.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -55,7 +55,7 @@
strcpy((char *) &event.EventDataUnion.UserEvent.UserEventData.Data, data[0]);
retc = oh_el_prepend(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_prepend failed.");
+ CRIT("oh_el_prepend failed.");
return 1;
}
@@ -63,14 +63,14 @@
retc = oh_el_prepend(el, &event, NULL, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_prepend failed.");
+ CRIT("oh_el_prepend failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_021.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_021.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_021.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -75,7 +75,7 @@
retc = oh_el_prepend(el, &event, NULL, &res1);
if (retc != SA_OK) {
- err("ERROR: oh_el_prepend failed.");
+ CRIT("oh_el_prepend failed.");
return 1;
}
@@ -85,7 +85,7 @@
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_022.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_022.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_022.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -73,7 +73,7 @@
strcpy((char *) &event.EventDataUnion.UserEvent.UserEventData.Data, data[x]);
retc = oh_el_prepend(el, &event, &rdr, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_prepend failed.");
+ CRIT("oh_el_prepend failed.");
return 1;
}
}
@@ -82,7 +82,7 @@
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_023.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_023.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_023.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -45,7 +45,7 @@
retc = oh_el_clear(el);
if (retc == SA_OK) {
- err("ERROR: el clear failed.");
+ CRIT("el clear failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_024.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_024.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_024.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -46,7 +46,7 @@
retc = oh_el_get(el, SAHPI_NEWEST_ENTRY, &prev, &next, &entry);
if (retc == SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_025.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_025.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_025.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -47,14 +47,14 @@
retc = oh_el_setgentimestampflag(el, flag);
if (retc != SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_026.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_026.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_026.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -48,7 +48,7 @@
el = oh_el_create(20);
retc = oh_el_map_from_file(el, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
@@ -56,14 +56,14 @@
retc = oh_el_get(el, entry->event.EntryId, NULL, &next, &entry);
if (retc == SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_027.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_027.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_027.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -48,14 +48,14 @@
/* fetch the event for el*/
retc = oh_el_get(el, SAHPI_FIRST_ENTRY, &prev, &next, &entry);
if (retc == SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_028.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_028.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_028.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -45,7 +45,7 @@
el = oh_el_create(20);
retc = oh_el_map_from_file(el, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
@@ -53,14 +53,14 @@
retc = oh_el_get(el, SAHPI_NEWEST_ENTRY, &prev, &next, &entry);
if (retc != SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_029.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_029.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_029.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -46,7 +46,7 @@
el = oh_el_create(20);
retc = oh_el_map_from_file(el, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
@@ -56,14 +56,14 @@
retc = oh_el_get(el, myentry, &prev, &next, &entry);
if (retc == SA_OK) {
- err("ERROR: oh_el_get failed.");
+ CRIT("oh_el_get failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_030.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_030.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_030.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -49,7 +49,7 @@
retc = oh_el_info(el, &info);
if (retc == SA_OK) {
- err("ERROR: oh_el_info failed.");
+ CRIT("oh_el_info failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_031.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_031.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_031.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -49,14 +49,14 @@
retc = oh_el_info(el, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_info failed.");
+ CRIT("oh_el_info failed.");
return 1;
}
/* close el without saving to file*/
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_032.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_032.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_032.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -43,13 +43,13 @@
el = oh_el_create(20);
retc = oh_el_map_from_file(el, "./elTest.data");
if (retc != SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
retc = oh_el_overflowreset(el);
if (retc != SA_OK) {
- err("ERROR: el info.OverflowFlagreset failed.");
+ CRIT("el info.OverflowFlagreset failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_033.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_033.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_033.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -45,7 +45,7 @@
retc = oh_el_overflowreset(el);
if (retc == SA_OK) {
- err("ERROR: oh_el_overflowreset failed.");
+ CRIT("oh_el_overflowreset failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_034.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_034.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_034.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -47,7 +47,7 @@
/* save the EL to file */
retc = oh_el_map_to_file(el, "./elTest.data");
if (retc == SA_OK) {
- err("ERROR: oh_el_map_to_file failed.");
+ CRIT("oh_el_map_to_file failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_035.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_035.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_035.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -48,14 +48,14 @@
retc = oh_el_map_to_file(el, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_map_to_file failed.");
+ CRIT("oh_el_map_to_file failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_036.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_036.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_036.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -47,7 +47,7 @@
retc = oh_el_map_from_file(el, "./elTest.data");
if (retc == SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_037.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_037.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_037.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -47,14 +47,14 @@
retc = oh_el_map_from_file(el, "./elTest.data");
if (retc == SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_038.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_038.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_038.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -46,14 +46,14 @@
retc = oh_el_map_from_file(el, NULL);
if (retc == SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_039.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_039.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_039.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -48,14 +48,14 @@
retc = oh_el_map_from_file(el, "./notthere.data");
if (retc == SA_OK) {
- err("ERROR: oh_el_map_from_file failed.");
+ CRIT("oh_el_map_from_file failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_040.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_040.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_040.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -48,7 +48,7 @@
retc = oh_el_timeset(el, timestamp + 20);
if (retc == SA_OK){
- err("ERROR: oh_el_timeset failed");
+ CRIT("oh_el_timeset failed");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_041.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_041.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_041.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -47,14 +47,14 @@
retc = oh_el_timeset(el, SAHPI_TIME_UNSPECIFIED);
if (retc == SA_OK){
- err("ERROR: oh_el_timeset on el failed");
+ CRIT("oh_el_timeset on el failed");
return 1;
}
/* close el without saving to file*/
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_042.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_042.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_042.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -46,7 +46,7 @@
retc = oh_el_timeset(el, timestamp + 20);
if (retc != SA_OK){
- err("ERROR: oh_el_timeset failed");
+ CRIT("oh_el_timeset failed");
return 1;
}
@@ -54,7 +54,7 @@
/* close el without saving to file*/
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_043.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_043.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_043.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -46,7 +46,7 @@
retc = oh_el_timeset(el, SAHPI_TIME_MAX_RELATIVE + 20);
if (retc != SA_OK){
- err("ERROR: oh_el_timeset failed");
+ CRIT("oh_el_timeset failed");
return 1;
}
@@ -54,7 +54,7 @@
/* close el without saving to file*/
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_044.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_044.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_044.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -48,7 +48,7 @@
/* save the EL to file */
retc = oh_el_setgentimestampflag(el, flag);
if (retc == SA_OK) {
- err("ERROR: oh_el_setgentimestampflag failed.");
+ CRIT("oh_el_setgentimestampflag failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/el/el_test_045.c
===================================================================
--- openhpi/trunk/utils/t/el/el_test_045.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/el/el_test_045.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -61,14 +61,14 @@
retc = oh_el_prepend(el, &event, NULL, NULL);
if (retc != SA_OK) {
- err("ERROR: oh_el_prepend failed.");
+ CRIT("oh_el_prepend failed.");
return 1;
}
/* close el */
retc = oh_el_close(el);
if (retc != SA_OK) {
- err("ERROR: oh_el_close on el failed.");
+ CRIT("oh_el_close on el failed.");
return 1;
}
Modified: openhpi/trunk/utils/t/sahpi/sahpi_text_utils_test.c
===================================================================
--- openhpi/trunk/utils/t/sahpi/sahpi_text_utils_test.c 2010-12-24 16:14:39 UTC (rev 7226)
+++ openhpi/trunk/utils/t/sahpi/sahpi_text_utils_test.c 2010-12-24 17:29:43 UTC (rev 7227)
@@ -37,7 +37,7 @@
#define failed(num) \
do { \
failcount++; \
- err("Failed Test %d", num); \
+ CRIT("Failed Test %d", num); \
} while(0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|