[PATCH] Remove extra newline characters at end of CU_DEBUG calls

# HG changeset patch # User Jay Gagnon <grendel@linux.vnet.ibm.com> # Date 1194980442 18000 # Node ID cd4498fc44de514aed4232f5ee1a9a4828d8e3b1 # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa Remove extra newline characters at end of CU_DEBUG calls. Signed-off-by: Jay Gagnon <grendel@linux.vnet.ibm.com> diff -r 5f84fd6c5cde -r cd4498fc44de std_association.c --- a/std_association.c Thu Nov 08 11:21:50 2007 -0800 +++ b/std_association.c Tue Nov 13 14:00:42 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: \tinfo->result_class: '%s'", info->result_class); rc = match_class(ctx->brkr, @@ -162,35 +162,35 @@ static CMPIStatus do_assoc(struct std_as info->result_class, handler->target_class); if (!rc) { - CU_DEBUG("Match_class failed.\n"); - goto out; - } - CU_DEBUG("Match_class succeeded.\n"); - - CU_DEBUG("Calling match_class: \n\tinfo->assoc_class: '%s'\n", + CU_DEBUG("Match_class failed."); + goto out; + } + CU_DEBUG("Match_class succeeded."); + + CU_DEBUG("Calling match_class: \tinfo->assoc_class: '%s'", info->result_class); rc = match_class(ctx->brkr, NAMESPACE(ref), info->assoc_class, handler->assoc_class); if (!rc) { - CU_DEBUG("Match_class failed.\n"); - goto out; - } - CU_DEBUG("Match_class succeeded.\n"); - CU_DEBUG("Calling handler->handler...\n"); + CU_DEBUG("Match_class failed."); + goto out; + } + CU_DEBUG("Match_class succeeded."); + CU_DEBUG("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; } @@ -199,15 +199,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) @@ -218,7 +218,6 @@ static CMPIStatus do_assoc(struct std_as out: inst_list_free(&list); - CU_DEBUG("Returning.\n"); return s; }

Jay Gagnon wrote:
# HG changeset patch # User Jay Gagnon <grendel@linux.vnet.ibm.com> # Date 1194980442 18000 # Node ID cd4498fc44de514aed4232f5ee1a9a4828d8e3b1 # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa Remove extra newline characters at end of CU_DEBUG calls.
Signed-off-by: Jay Gagnon <grendel@linux.vnet.ibm.com>
Sorry forgot the [CU] prefix on this one. -- -Jay

Jay Gagnon wrote:
# HG changeset patch # User Jay Gagnon <grendel@linux.vnet.ibm.com> # Date 1194980442 18000 # Node ID cd4498fc44de514aed4232f5ee1a9a4828d8e3b1 # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa Remove extra newline characters at end of CU_DEBUG calls.
Signed-off-by: Jay Gagnon <grendel@linux.vnet.ibm.com>
Looks good. +1 -- Kaitlin Rupert IBM Linux Technology Center karupert@us.ibm.com

JG> # HG changeset patch JG> # User Jay Gagnon <grendel@linux.vnet.ibm.com> JG> # Date 1194980442 18000 JG> # Node ID cd4498fc44de514aed4232f5ee1a9a4828d8e3b1 JG> # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa JG> Remove extra newline characters at end of CU_DEBUG calls. This one fails to apply for me. Looks like it was made against an old tree. The current one has some cu_statusf() calls in the first rejected hunk that your patch does not. Here is the .rej: *************** static CMPIStatus do_assoc(struct std_as *** 162,196 **** info->result_class, handler->target_class); if (!rc) { - CU_DEBUG("Match_class failed.\n"); - goto out; - } - CU_DEBUG("Match_class succeeded.\n"); - - CU_DEBUG("Calling match_class: \n\tinfo->assoc_class: '%s'\n", info->result_class); rc = match_class(ctx->brkr, NAMESPACE(ref), info->assoc_class, handler->assoc_class); if (!rc) { - CU_DEBUG("Match_class failed.\n"); - goto out; - } - CU_DEBUG("Match_class succeeded.\n"); - CU_DEBUG("Calling handler->handler...\n"); s = handler->handler(ref, info, &list); if (s.rc != CMPI_RC_OK) { - CU_DEBUG("\thandler did not return CMPI_RC_OK.\n"); goto out; } else { - CU_DEBUG("\thandler returned CMPI_RC_OK.\n"); } if (list.list == NULL) { - CU_DEBUG("\tlist is empty.\n"); goto out; } --- 162,196 ---- info->result_class, handler->target_class); if (!rc) { + CU_DEBUG("Match_class failed."); + goto out; + } + CU_DEBUG("Match_class succeeded."); + + CU_DEBUG("Calling match_class: \tinfo->assoc_class: '%s'", info->result_class); rc = match_class(ctx->brkr, NAMESPACE(ref), info->assoc_class, handler->assoc_class); if (!rc) { + CU_DEBUG("Match_class failed."); + goto out; + } + CU_DEBUG("Match_class succeeded."); + CU_DEBUG("Calling handler->handler..."); s = handler->handler(ref, info, &list); if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Handler did not return CMPI_RC_OK."); goto out; } else { + CU_DEBUG("Handler returned CMPI_RC_OK."); } if (list.list == NULL) { + CU_DEBUG("List is empty."); goto out; } -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com

Dan Smith wrote:
JG> # HG changeset patch JG> # User Jay Gagnon <grendel@linux.vnet.ibm.com> JG> # Date 1194980442 18000 JG> # Node ID cd4498fc44de514aed4232f5ee1a9a4828d8e3b1 JG> # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa JG> Remove extra newline characters at end of CU_DEBUG calls.
This one fails to apply for me. Looks like it was made against an old tree. The current one has some cu_statusf() calls in the first rejected hunk that your patch does not.
Oops, that's a bit embarrassing. Looked at the tree a bit and I think I actually just had a slightly outdated version, since the pull URLs and everything were good. At any rate, I'll make sure it's all current and try again. -- -Jay
participants (3)
-
Dan Smith
-
Jay Gagnon
-
Kaitlin Rupert