Similar to my messages on November 5, the following changes look like
they could be made to the infrastructure code to address issue #1804512,
"Debug output occurring during normal operation". Almost all are
commented out code, so would be no change to executable code. A few are
places where the new warn macro appears to make more sense.
--
Bryan Sutula <[EMAIL PROTECTED]>
-----------------------------------------------------------
Index: src/init.c
===================================================================
--- src/init.c (revision 6608)
+++ src/init.c (working copy)
@@ -114,16 +114,16 @@
* all of them failed to load, Then return with an error.
*/
if (config.handlers_defined > 0 && config.handlers_loaded == 0) {
- err("Warning: Handlers were defined, but none loaded.");
+ warn("Warning: Handlers were defined, but none loaded.");
} else if (config.handlers_defined > 0 &&
config.handlers_loaded < config.handlers_defined) {
- err("*Warning*: Not all handlers defined loaded."
- " Check previous messages.");
+ warn("*Warning*: Not all handlers defined loaded."
+ " Check previous messages.");
}
if (config.domains_defined != config.domains_loaded) {
- err("*Warning*: Not all domains defined where created."
- " Check previous messages.");
+ warn("*Warning*: Not all domains defined where created."
+ " Check previous messages.");
}
/* this only does something if the config says to */
@@ -136,9 +136,9 @@
/* Check if there are any handlers loaded */
if (config.handlers_defined == 0) {
- err("*Warning*: No handler definitions found in config file."
- " Check configuration file %s and previous messages",
- config_param.u.conf);
+ warn("*Warning*: No handler definitions found in config file."
+ " Check configuration file %s and previous messages",
+ config_param.u.conf);
}
/*
Index: src/config.c
===================================================================
--- src/config.c (revision 6608)
+++ src/config.c (working copy)
@@ -661,7 +661,7 @@
while (!done) {
guint my_token;
my_token = g_scanner_peek_next_token (oh_scanner);
- /*err("token: %d", my_token);*/
+ /*dbg("token: %d", my_token);*/
switch (my_token)
{
case G_TOKEN_EOF:
Index: src/domain.c
===================================================================
--- src/domain.c (revision 6608)
+++ src/domain.c (working copy)
@@ -495,9 +495,9 @@
}
if (peer_of && entity_pattern) {
- err("Warning creating domain %u. Entity pattern will be"
- " disregarded since a peer was specified.",
- *id);
+ warn("Warning creating domain %u. Entity pattern will be"
+ " disregarded since a peer was specified.",
+ *id);
} else if (!peer_of &&
oh_compile_entitypath_pattern(entity_pattern, &epp)) {
err("Error creating domain %u. "
Index: utils/uid_utils.c
===================================================================
--- utils/uid_utils.c (revision 6608)
+++ utils/uid_utils.c (working copy)
@@ -203,7 +203,7 @@
/* previously assigned uid */
ep_xref = (EP_XREF *)g_hash_table_lookup (oh_ep_table, key);
if (ep_xref) {
- /*err("Entity Path already assigned uid. Use
oh_uid_lookup().");*/
+ /*dbg("Entity Path already assigned uid. Use
oh_uid_lookup().");*/
uid_unlock(&oh_uid_lock);
return ep_xref->resource_id;
}
Index: utils/epath_utils.c
===================================================================
--- utils/epath_utils.c (revision 6608)
+++ utils/epath_utils.c (working copy)
@@ -465,7 +465,7 @@
for (i=0; i<j; i++) {
if (ep1->Entry[i].EntityType != ep2->Entry[i].EntityType ||
ep1->Entry[i].EntityLocation !=
ep2->Entry[i].EntityLocation) {
- /* err("Entity element %d: EP1 {%d,%d} != EP2
{%d,%d}", i,
+ /* dbg("Entity element %d: EP1 {%d,%d} != EP2
{%d,%d}", i,
ep1->Entry[i].EntityType,
ep1->Entry[i].EntityLocation,
ep2->Entry[i].EntityType,
Index: utils/rpt_utils.c
===================================================================
--- utils/rpt_utils.c (revision 6608)
+++ utils/rpt_utils.c (working copy)
@@ -45,7 +45,7 @@
}
if (!(table->rptlist)) {
- /*err("Info: RPT is empty.");*/
+ /*dbg("Info: RPT is empty.");*/
return NULL;
}
@@ -69,7 +69,7 @@
}
if (!(table->rptlist)) {
- /*err("Info: RPT is empty.");*/
+ /*dbg("Info: RPT is empty.");*/
return NULL;
}
@@ -93,7 +93,7 @@
}
if (!rptentry->rdrlist) {
- /*err("Info: RDR repository is empty.");*/
+ /*dbg("Info: RDR repository is empty.");*/
return NULL;
}
@@ -117,7 +117,7 @@
}
if (!rptentry->rdrlist) {
- /*err("Info: RPT is empty.");*/
+ /*dbg("Info: RPT is empty.");*/
return NULL;
}
@@ -524,7 +524,7 @@
rptentry = get_rptentry_by_rid(table, rid);
if (!rptentry) {
- /*err("Warning: RPT entry not found. Returning NULL.");*/
+ /*dbg("Warning: RPT entry not found. Returning NULL.");*/
return NULL;
}
@@ -549,7 +549,7 @@
rptentry = get_rptentry_by_rid(table, rid);
if (!rptentry) {
- /*err("Warning: RPT entry not found. Returning NULL.");*/
+ /*dbg("Warning: RPT entry not found. Returning NULL.");*/
return NULL;
}
@@ -595,7 +595,7 @@
}
if (!rptentry) {
- /*err("Warning: RPT entry not found. Returning NULL.");*/
+ /*dbg("Warning: RPT entry not found. Returning NULL.");*/
return NULL;
}
@@ -791,7 +791,7 @@
rdrecord = get_rdrecord_by_id(rptentry, rdrid);
if (!rdrecord) {
- /*err("Warning: RDR not found. Returning NULL.");*/
+ /*dbg("Warning: RDR not found. Returning NULL.");*/
return NULL;
}
@@ -826,7 +826,7 @@
rdrecord = get_rdrecord_by_id(rptentry, rdrid);
if (!rdrecord) {
- /*err("Warning: RDR not found. Returning NULL.");*/
+ /*dbg("Warning: RDR not found. Returning NULL.");*/
return NULL;
}
@@ -865,7 +865,7 @@
rdr_uid = oh_get_rdr_uid(type, num);
rdrecord = get_rdrecord_by_id(rptentry, rdr_uid);
if (!rdrecord) {
- /*err("Warning: RDR not found. Returning NULL.");*/
+ /*dbg("Warning: RDR not found. Returning NULL.");*/
return NULL;
}
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Openhpi-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openhpi-devel
