Re: [Libvirt-cim] [PATCH] Remove extra newline characters at end of CU_DEBUG calls

JG> # HG changeset patch JG> # User Jay Gagnon <grendel(a)linux.vnet.ibm.com&gt; 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(a)us.ibm.com