Menu
▾
▴
[Ltp-cvs] ltp/testcases/open_hpi_testsuite/plugins/rtas Makefile.am, 1.1, 1.2 Makefile.in, 1.5, 1.6 rtas.c, 1.1, 1.2 rtas_discover.c, 1.1, 1.2 rtas_event.c, 1.1, 1.2 rtas_inventory.c, 1.1, 1.2 rtas_sensor.c, 1.1, 1.2
Update of /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26022/ltp/testcases/open_hpi_testsuite/plugins/rtas Modified Files: Makefile.am Makefile.in rtas.c rtas_discover.c rtas_event.c rtas_inventory.c rtas_sensor.c Log Message: Update to OpenHPI 2.12.0 (see www.openhpi.org for more info) Index: rtas_discover.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas/rtas_discover.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rtas_discover.c 25 Jun 2007 15:44:56 -0000 1.1 --- rtas_discover.c 26 Jul 2008 03:51:46 -0000 1.2 *************** *** 43,47 **** if (!hnd) { ! dbg("Null handle!"); return SA_ERR_HPI_INVALID_PARAMS; } --- 43,47 ---- if (!hnd) { ! err("Null handle!"); return SA_ERR_HPI_INVALID_PARAMS; } *************** *** 49,53 **** entity_root = (char *)g_hash_table_lookup(h->config, "entity_root"); if (entity_root == NULL) { ! dbg("Could not aquire entity_root parameter."); return SA_ERR_HPI_INTERNAL_ERROR; } --- 49,53 ---- entity_root = (char *)g_hash_table_lookup(h->config, "entity_root"); if (entity_root == NULL) { ! err("Could not aquire entity_root parameter."); return SA_ERR_HPI_INTERNAL_ERROR; } *************** *** 55,59 **** error = oh_encode_entitypath(entity_root, &root_ep); if (error) { ! dbg("Could not convert entity path to string. Error=%s.", oh_lookup_error(error)); return SA_ERR_HPI_INTERNAL_ERROR; } --- 55,59 ---- error = oh_encode_entitypath(entity_root, &root_ep); if (error) { ! err("Could not convert entity path to string. Error=%s.", oh_lookup_error(error)); return SA_ERR_HPI_INTERNAL_ERROR; } *************** *** 87,91 **** oh_evt_queue_push(h->eventq, e); } else { ! dbg("Error adding resource. %s", oh_lookup_error(error)); return error; } --- 87,91 ---- oh_evt_queue_push(h->eventq, e); } else { ! err("Error adding resource. %s", oh_lookup_error(error)); return error; } *************** *** 130,134 **** file = fopen(RTAS_SENSORS_PATH, "r"); if (!file) { ! dbg("Error reading RTAS sensor file %s.", RTAS_SENSORS_PATH); return SA_ERR_HPI_INTERNAL_ERROR; } --- 130,134 ---- file = fopen(RTAS_SENSORS_PATH, "r"); if (!file) { ! err("Error reading RTAS sensor file %s.", RTAS_SENSORS_PATH); return SA_ERR_HPI_INTERNAL_ERROR; } *************** *** 178,182 **** if (!rdr || !sensor_info) { ! dbg("Out of memory."); return SA_ERR_HPI_OUT_OF_SPACE; } --- 178,182 ---- if (!rdr || !sensor_info) { ! err("Out of memory."); return SA_ERR_HPI_OUT_OF_SPACE; } *************** *** 637,641 **** file = popen(LSVPD_CMD, "r"); if (!file) { ! dbg("Error finding rtas inventory command %s", LSVPD_CMD); return SA_ERR_HPI_INTERNAL_ERROR; } --- 637,641 ---- file = popen(LSVPD_CMD, "r"); if (!file) { ! err("Error finding rtas inventory command %s", LSVPD_CMD); return SA_ERR_HPI_INTERNAL_ERROR; } *************** *** 649,653 **** if (strlen(line) < 5) { /* Check line. 5 chars long at least. */ ! dbg("Bad line from " LSVPD_CMD); pclose(file); return SA_ERR_HPI_INTERNAL_ERROR; --- 649,653 ---- if (strlen(line) < 5) { /* Check line. 5 chars long at least. */ ! err("Bad line from " LSVPD_CMD); pclose(file); return SA_ERR_HPI_INTERNAL_ERROR; *************** *** 678,682 **** oh_area->fields = g_slist_append(oh_area->fields, field); } else { ! dbg("Bad Error creating field. There is no area yet."); pclose(file); return SA_ERR_HPI_INTERNAL_ERROR; --- 678,682 ---- oh_area->fields = g_slist_append(oh_area->fields, field); } else { ! err("Bad Error creating field. There is no area yet."); pclose(file); return SA_ERR_HPI_INTERNAL_ERROR; Index: rtas_inventory.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas/rtas_inventory.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rtas_inventory.c 25 Jun 2007 15:44:56 -0000 1.1 --- rtas_inventory.c 26 Jul 2008 03:51:46 -0000 1.2 *************** *** 131,135 **** rdr = oh_get_rdr_by_type(h->rptcache, rid, SAHPI_INVENTORY_RDR, idrid); if (!rdr) { ! dbg("RDR not found. %u->inventory->%u", rid, idrid); return SA_ERR_HPI_NOT_PRESENT; } --- 131,135 ---- rdr = oh_get_rdr_by_type(h->rptcache, rid, SAHPI_INVENTORY_RDR, idrid); if (!rdr) { ! err("RDR not found. %u->inventory->%u", rid, idrid); return SA_ERR_HPI_NOT_PRESENT; } *************** *** 137,141 **** idr_info = oh_get_rdr_data(h->rptcache, rid, rdr->RecordId); if (!idr_info) { ! dbg("IDR data not found! %u->%u", rid, rdr->RecordId); return SA_ERR_HPI_INTERNAL_ERROR; } --- 137,141 ---- idr_info = oh_get_rdr_data(h->rptcache, rid, rdr->RecordId); if (!idr_info) { ! err("IDR data not found! %u->%u", rid, rdr->RecordId); return SA_ERR_HPI_INTERNAL_ERROR; } Index: Makefile.in =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 5 May 2008 11:18:17 -0000 1.5 --- Makefile.in 26 Jul 2008 03:51:46 -0000 1.6 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 78,82 **** $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(librtas2hpi_la_LDFLAGS) $(LDFLAGS) -o $@ ! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles --- 78,82 ---- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(librtas2hpi_la_LDFLAGS) $(LDFLAGS) -o $@ ! DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles *************** *** 106,112 **** CFLAGS = @CFLAGS@ CONFPATH = @CONFPATH@ - COV_CFLAGS = @COV_CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ --- 106,112 ---- CFLAGS = @CFLAGS@ CONFPATH = @CONFPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ + CRYPTO_LIB = @CRYPTO_LIB@ CXX = @CXX@ CXXCPP = @CXXCPP@ *************** *** 131,134 **** --- 131,135 ---- HPI_PKG = @HPI_PKG@ HPI_UTIL_PKG = @HPI_UTIL_PKG@ + ILO2_RIBCL = @ILO2_RIBCL@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ *************** *** 142,146 **** LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ - LIST_RESOURCES_THREADED = @LIST_RESOURCES_THREADED@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ --- 143,146 ---- *************** *** 149,155 **** MARSHALDIR = @MARSHALDIR@ MKDIR_P = @MKDIR_P@ ! NOCFLAGS = @NOCFLAGS@ ! NOCXXFLAGS = @NOCXXFLAGS@ OBJEXT = @OBJEXT@ OPENHPI_INCLUDES = @OPENHPI_INCLUDES@ OPENIPMI_CFLAGS = @OPENIPMI_CFLAGS@ --- 149,155 ---- MARSHALDIR = @MARSHALDIR@ MKDIR_P = @MKDIR_P@ ! OA_SOAP = @OA_SOAP@ OBJEXT = @OBJEXT@ + OH_SSL_INCLUDES = @OH_SSL_INCLUDES@ OPENHPI_INCLUDES = @OPENHPI_INCLUDES@ OPENIPMI_CFLAGS = @OPENIPMI_CFLAGS@ *************** *** 173,176 **** --- 173,177 ---- SNMPLIBS = @SNMPLIBS@ SNMP_BC = @SNMP_BC@ + SSLDIR = @SSLDIR@ SSL_LIB = @SSL_LIB@ STATIC_PLUGIN = @STATIC_PLUGIN@ *************** *** 184,191 **** --- 185,197 ---- VERSION = @VERSION@ WATCHDOG = @WATCHDOG@ + WITH_DOCBOOK2HTML = @WITH_DOCBOOK2HTML@ + WITH_ILO2_RIBCL = @WITH_ILO2_RIBCL@ WITH_IPMI = @WITH_IPMI@ + WITH_OA_SOAP = @WITH_OA_SOAP@ WITH_RTAS = @WITH_RTAS@ WITH_SNMP_BC = @WITH_SNMP_BC@ WITH_SYSFS = @WITH_SYSFS@ + XML2_INCLUDE = @XML2_INCLUDE@ + XML2_LIB = @XML2_LIB@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ *************** *** 246,266 **** MAINTAINERCLEANFILES = Makefile.in INCLUDES = @OPENHPI_INCLUDES@ - AM_CFLAGS = @CFLAGS@ pkglib_LTLIBRARIES = librtas2hpi.la ! librtas2hpi_la_SOURCES = rtas.c \ ! rtas_annunciator.c \ ! rtas_discover.c \ ! rtas_control.c \ ! rtas_event.c \ ! rtas_eventlog.c \ ! rtas_hotswap.c \ ! rtas_indicator.c \ ! rtas_inventory.c \ ! rtas_power.c \ ! rtas_reset.c \ ! rtas_resource.c \ ! rtas_sensor.c \ ! rtas_utils.c \ ! rtas_watchdog.c librtas2hpi_la_LIBADD = -luuid -lrtas -lrtasevent $(top_builddir)/utils/libopenhpiutils.la --- 252,271 ---- MAINTAINERCLEANFILES = Makefile.in INCLUDES = @OPENHPI_INCLUDES@ pkglib_LTLIBRARIES = librtas2hpi.la ! librtas2hpi_la_SOURCES = rtas.h rtas.c \ ! rtas_annunciator.h rtas_annunciator.c \ ! rtas_discover.h rtas_discover.c \ ! rtas_control.h rtas_control.c \ ! rtas_event.h rtas_event.c \ ! rtas_eventlog.h rtas_eventlog.c \ ! rtas_hotswap.h rtas_hotswap.c \ ! rtas_indicator.h rtas_indicator.c \ ! rtas_inventory.h rtas_inventory.c \ ! rtas_power.h rtas_power.c \ ! rtas_reset.h rtas_reset.c \ ! rtas_resource.h rtas_resource.c \ ! rtas_sensor.h rtas_sensor.c \ ! rtas_utils.h rtas_utils.c \ ! rtas_watchdog.h rtas_watchdog.c librtas2hpi_la_LIBADD = -luuid -lrtas -lrtasevent $(top_builddir)/utils/libopenhpiutils.la *************** *** 305,310 **** if test -f $$p; then \ f=$(am__strip_dir) \ ! echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ ! $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ else :; fi; \ done --- 310,315 ---- if test -f $$p; then \ f=$(am__strip_dir) \ ! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ ! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ else :; fi; \ done *************** *** 314,319 **** @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ ! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ ! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ done --- 319,324 ---- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ ! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ ! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ done *************** *** 383,388 **** if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS --- 388,393 ---- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ! END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS *************** *** 396,401 **** if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ --- 401,406 ---- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ! END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ *************** *** 407,417 **** $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ --- 412,421 ---- $(TAGS_FILES) $(LISP) tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ! END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ Index: rtas.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas/rtas.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rtas.c 25 Jun 2007 15:44:56 -0000 1.1 --- rtas.c 26 Jul 2008 03:51:46 -0000 1.2 *************** *** 22,32 **** if (!handler_config) { ! dbg("No configuration passed."); return NULL; } else if (!hid) { ! dbg("Bad handler id passed."); return NULL; } else if (!eventq) { ! dbg("No event queue was passed."); return NULL; } --- 22,32 ---- if (!handler_config) { ! err("No configuration passed."); return NULL; } else if (!hid) { ! err("Bad handler id passed."); return NULL; } else if (!eventq) { ! err("No event queue was passed."); return NULL; } *************** *** 34,38 **** entity_root = (char *)g_hash_table_lookup(handler_config, "entity_root"); if (!entity_root) { ! dbg("Cannot find \"entity_root\" configuration parameter."); return NULL; } --- 34,38 ---- entity_root = (char *)g_hash_table_lookup(handler_config, "entity_root"); if (!entity_root) { ! err("Cannot find \"entity_root\" configuration parameter."); return NULL; } Index: Makefile.am =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 25 Jun 2007 15:44:56 -0000 1.1 --- Makefile.am 26 Jul 2008 03:51:46 -0000 1.2 *************** *** 18,40 **** INCLUDES = @OPENHPI_INCLUDES@ - AM_CFLAGS = @CFLAGS@ - pkglib_LTLIBRARIES = librtas2hpi.la ! librtas2hpi_la_SOURCES = rtas.c \ ! rtas_annunciator.c \ ! rtas_discover.c \ ! rtas_control.c \ ! rtas_event.c \ ! rtas_eventlog.c \ ! rtas_hotswap.c \ ! rtas_indicator.c \ ! rtas_inventory.c \ ! rtas_power.c \ ! rtas_reset.c \ ! rtas_resource.c \ ! rtas_sensor.c \ ! rtas_utils.c \ ! rtas_watchdog.c librtas2hpi_la_LIBADD = -luuid -lrtas -lrtasevent $(top_builddir)/utils/libopenhpiutils.la --- 18,38 ---- INCLUDES = @OPENHPI_INCLUDES@ pkglib_LTLIBRARIES = librtas2hpi.la ! librtas2hpi_la_SOURCES = rtas.h rtas.c \ ! rtas_annunciator.h rtas_annunciator.c \ ! rtas_discover.h rtas_discover.c \ ! rtas_control.h rtas_control.c \ ! rtas_event.h rtas_event.c \ ! rtas_eventlog.h rtas_eventlog.c \ ! rtas_hotswap.h rtas_hotswap.c \ ! rtas_indicator.h rtas_indicator.c \ ! rtas_inventory.h rtas_inventory.c \ ! rtas_power.h rtas_power.c \ ! rtas_reset.h rtas_reset.c \ ! rtas_resource.h rtas_resource.c \ ! rtas_sensor.h rtas_sensor.c \ ! rtas_utils.h rtas_utils.c \ ! rtas_watchdog.h rtas_watchdog.c librtas2hpi_la_LIBADD = -luuid -lrtas -lrtasevent $(top_builddir)/utils/libopenhpiutils.la Index: rtas_sensor.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas/rtas_sensor.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rtas_sensor.c 25 Jun 2007 15:44:57 -0000 1.1 --- rtas_sensor.c 26 Jul 2008 03:51:46 -0000 1.2 *************** *** 64,68 **** if (!handler) { ! dbg("Invalid parameter."); return(SA_ERR_HPI_INVALID_PARAMS); } --- 64,68 ---- if (!handler) { ! err("Invalid parameter."); return(SA_ERR_HPI_INVALID_PARAMS); } *************** *** 97,101 **** if (sensor_info == NULL) { //unlock it ! dbg("No sensor data. Sensor=%s", rdr->IdString.Data); return(SA_ERR_HPI_INTERNAL_ERROR); } --- 97,101 ---- if (sensor_info == NULL) { //unlock it ! err("No sensor data. Sensor=%s", rdr->IdString.Data); return(SA_ERR_HPI_INTERNAL_ERROR); } *************** *** 104,108 **** sensor_state = SAHPI_ES_UNSPECIFIED; ! trace("Sensor Reading: Resource=%s; RDR=%s", rpt->ResourceTag.Data, rdr->IdString.Data); /************************************************************ --- 104,108 ---- sensor_state = SAHPI_ES_UNSPECIFIED; ! dbg("Sensor Reading: Resource=%s; RDR=%s", rpt->ResourceTag.Data, rdr->IdString.Data); /************************************************************ *************** *** 120,124 **** decode_rtas_error(state, err_buf, sizebuf, sensor_info->token, sensor_info->index); ! dbg("Cannot determine sensor's reading. Error=%s", err_buf); //unlock it --- 120,124 ---- decode_rtas_error(state, err_buf, sizebuf, sensor_info->token, sensor_info->index); ! err("Cannot determine sensor's reading. Error=%s", err_buf); //unlock it *************** *** 140,144 **** decode_rtas_error(state, err_buf, sizebuf, sensor_info->token, sensor_info->index); ! dbg("Cannot determine sensor's reading. Error=%s", err_buf); //unlock it /* NEED TO MAP RTAS ERRORS TO HPI ERRORS */ --- 140,144 ---- decode_rtas_error(state, err_buf, sizebuf, sensor_info->token, sensor_info->index); ! err("Cannot determine sensor's reading. Error=%s", err_buf); //unlock it /* NEED TO MAP RTAS ERRORS TO HPI ERRORS */ *************** *** 273,277 **** if (!handler || !thresholds) { ! dbg("Invalid parameter."); return(SA_ERR_HPI_INVALID_PARAMS); } --- 273,277 ---- if (!handler || !thresholds) { ! err("Invalid parameter."); return(SA_ERR_HPI_INVALID_PARAMS); } *************** *** 301,305 **** sinfo = (struct SensorInfo *)oh_get_rdr_data(handler_state->rptcache, resourceid, rdr->RecordId); if (sinfo == NULL) { ! dbg("No sensor data. Sensor=%s", rdr->IdString.Data); //unlock it return(SA_ERR_HPI_INTERNAL_ERROR); --- 301,305 ---- sinfo = (struct SensorInfo *)oh_get_rdr_data(handler_state->rptcache, resourceid, rdr->RecordId); if (sinfo == NULL) { ! err("No sensor data. Sensor=%s", rdr->IdString.Data); //unlock it return(SA_ERR_HPI_INTERNAL_ERROR); *************** *** 343,347 **** if (!handler || !thresholds) { ! dbg("Invalid parameter"); return(SA_ERR_HPI_INVALID_PARAMS); } --- 343,347 ---- if (!handler || !thresholds) { ! err("Invalid parameter"); return(SA_ERR_HPI_INVALID_PARAMS); } *************** *** 371,375 **** if (sinfo == NULL) { ! dbg("No sensor data. Sensor=%s", rdr->IdString.Data); //unlock it return(SA_ERR_HPI_INTERNAL_ERROR); --- 371,375 ---- if (sinfo == NULL) { ! err("No sensor data. Sensor=%s", rdr->IdString.Data); //unlock it return(SA_ERR_HPI_INTERNAL_ERROR); Index: rtas_event.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/rtas/rtas_event.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rtas_event.c 25 Jun 2007 15:44:56 -0000 1.1 --- rtas_event.c 26 Jul 2008 03:51:46 -0000 1.2 *************** *** 19,23 **** { if (!hnd) { ! dbg("Invalid parameter"); return(SA_ERR_HPI_INVALID_PARAMS); } --- 19,23 ---- { if (!hnd) { ! err("Invalid parameter"); return(SA_ERR_HPI_INVALID_PARAMS); } |