# HG changeset patch
# User Jay Gagnon <grendel(a)linux.vnet.ibm.com>
# Date 1194985986 18000
# Node ID 221011f9d887aade09533310e0e3fae5c51e71ef
# Parent 6f09834081cf603e73b82376f738e4384206ffc9
[CU] Remove extra newline characters at end of CU_DEBUG calls.
Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com>
diff -r 6f09834081cf -r 221011f9d887 std_association.c
--- a/std_association.c Mon Nov 12 11:03:04 2007 -0800
+++ b/std_association.c Tue Nov 13 15:33:06 2007 -0500
@@ -139,22 +139,22 @@ static CMPIStatus do_assoc(struct std_as
inst_list_init(&list);
- CU_DEBUG("Getting handler...\n");
+ CU_DEBUG("Getting handler...");
handler = std_assoc_get_handler(ctx, ref);
if (handler == NULL) {
- CU_DEBUG("No handler found.\n");
+ CU_DEBUG("No handler found.");
cu_statusf(ctx->brkr, &s,
CMPI_RC_ERR_FAILED,
"Unable to handle this association");
goto out;
}
- CU_DEBUG("OK.\n\tsource: '%s'\n\ttarget:
'%s'\n\tassoc_class: '%s'\n",
+ CU_DEBUG("OK.\n\tsource: '%s'\n\ttarget:
'%s'\n\tassoc_class: '%s'",
handler->source_class,
handler->target_class,
handler->assoc_class);
- CU_DEBUG("Calling match_class: \n\tinfo->result_class:
'%s'\n",
+ CU_DEBUG("Calling match_class: \n\tinfo->result_class:
'%s'",
info->result_class);
rc = match_class(ctx->brkr,
@@ -162,42 +162,41 @@ static CMPIStatus do_assoc(struct std_as
info->result_class,
handler->target_class);
if (!rc) {
- CU_DEBUG("Match_class failed.\n");
+ CU_DEBUG("Match_class failed.");
cu_statusf(ctx->brkr, &s,
CMPI_RC_ERR_FAILED,
"Result class is not valid for this association");
goto out;
}
- CU_DEBUG("Match_class succeeded.\n");
-
- CU_DEBUG("Calling match_class: \n\tinfo->assoc_class:
'%s'\n",
+ CU_DEBUG("Match_class succeeded.");
+
+ CU_DEBUG("Calling match_class: \n\tinfo->assoc_class:
'%s'",
info->assoc_class);
rc = match_class(ctx->brkr,
NAMESPACE(ref),
info->assoc_class,
handler->assoc_class);
if (!rc) {
- CU_DEBUG("Match_class failed.\n");
+ CU_DEBUG("Match_class failed.");
cu_statusf(ctx->brkr, &s,
CMPI_RC_ERR_FAILED,
"Association class given is not valid for"
"this association");
goto out;
}
- CU_DEBUG("Match_class succeeded.\n");
- CU_DEBUG("Calling handler->handler...\n");
+ CU_DEBUG("Match_class succeeded, calling handler->handler...");
s = handler->handler(ref, info, &list);
if (s.rc != CMPI_RC_OK) {
- CU_DEBUG("\thandler did not return CMPI_RC_OK.\n");
+ CU_DEBUG("Handler did not return CMPI_RC_OK.");
goto out;
} else {
- CU_DEBUG("\thandler returned CMPI_RC_OK.\n");
+ CU_DEBUG("Handler returned CMPI_RC_OK.");
}
if (list.list == NULL) {
- CU_DEBUG("\tlist is empty.\n");
+ CU_DEBUG("List is empty.");
goto out;
}
@@ -206,15 +205,15 @@ static CMPIStatus do_assoc(struct std_as
info->result_class,
ctx->brkr);
if (s.rc != CMPI_RC_OK) {
- CU_DEBUG("\tfilter_results did not return CMPI_RC_OK.\n");
+ CU_DEBUG("filter_results did not return CMPI_RC_OK.");
goto out;
}
if (list.list == NULL) {
- CU_DEBUG("\tlist is empty.\n");
+ CU_DEBUG("List is empty.");
goto out;
} else {
- CU_DEBUG("\treturned %u instance(s).\n", list.cur);
+ CU_DEBUG("Returned %u instance(s).", list.cur);
}
if (names_only)
@@ -225,7 +224,6 @@ static CMPIStatus do_assoc(struct std_as
out:
inst_list_free(&list);
- CU_DEBUG("Returning.\n");
return s;
}
Show replies by date
Jay Gagnon wrote:
# HG changeset patch
# User Jay Gagnon <grendel(a)linux.vnet.ibm.com>
# Date 1194985986 18000
# Node ID 221011f9d887aade09533310e0e3fae5c51e71ef
# Parent 6f09834081cf603e73b82376f738e4384206ffc9
[CU] Remove extra newline characters at end of CU_DEBUG calls.
Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com>
This time I've got the aforementioned cu_statusf() calls in my diff
context and the tree is up to date, so should apply cleanly.
--
-Jay
JG> # HG changeset patch
JG> # User Jay Gagnon <grendel(a)linux.vnet.ibm.com>
JG> # Date 1194985986 18000
JG> # Node ID 221011f9d887aade09533310e0e3fae5c51e71ef
JG> # Parent 6f09834081cf603e73b82376f738e4384206ffc9
JG> [CU] Remove extra newline characters at end of CU_DEBUG calls.
Got it that time. Thanks :)
--
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms(a)us.ibm.com