From 95aa56074c64d947ad505ca41df2789d2db1b8d3 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 8 Nov 2016 11:51:59 -0800 Subject: qcacld-3.0: FWLOG: Fix incorrect use of "\" line continuation Currently there are instances of the "\" line continuation character being used inside quoted strings. This has the undesired side effect of including the indentation of the continued line as part of the quoted string. In addition per the Linux Coding Style user-visible strings should not be split. So remove all incorrect instances of "\" line continuation from FWLOG. Change-Id: Ib4a64cfa6e05966a7e0151c249304d34088ff2e4 CRs-Fixed: 1087325 --- core/utils/fwlog/dbglog_host.c | 66 ++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c index 07441d4c5009..599a5cb2e82e 100644 --- a/core/utils/fwlog/dbglog_host.c +++ b/core/utils/fwlog/dbglog_host.c @@ -4167,11 +4167,23 @@ dbglog_wow_print_handler(A_UINT32 mod_id, case WOW_NS_OFLD_ENABLE: if (4 == numargs) { dbglog_printf(timestamp, vap_id, - "Enable NS offload, for sender %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), - *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), *((A_UINT8 *) &args[1] + 3), - *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), - *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); + "Enable NS offload, for sender %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", + *(A_UINT8 *) &args[0], + *((A_UINT8 *) &args[0] + 1), + *((A_UINT8 *) &args[0] + 2), + *((A_UINT8 *) &args[0] + 3), + *(A_UINT8 *) &args[1], + *((A_UINT8 *) &args[1] + 1), + *((A_UINT8 *) &args[1] + 2), + *((A_UINT8 *) &args[1] + 3), + *(A_UINT8 *) &args[2], + *((A_UINT8 *) &args[2] + 1), + *((A_UINT8 *) &args[2] + 2), + *((A_UINT8 *) &args[2] + 3), + *(A_UINT8 *) &args[3], + *((A_UINT8 *) &args[3] + 1), + *((A_UINT8 *) &args[3] + 2), + *((A_UINT8 *) &args[3] + 3)); } else { return false; } @@ -4199,11 +4211,23 @@ dbglog_wow_print_handler(A_UINT32 mod_id, case WOW_NS_RECEIVED: if (4 == numargs) { dbglog_printf(timestamp, vap_id, - "NS requested from %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), - *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), - *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), - *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); + "NS requested from %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", + *(A_UINT8 *) &args[0], + *((A_UINT8 *) &args[0] + 1), + *((A_UINT8 *) &args[0] + 2), + *((A_UINT8 *) &args[0] + 3), + *(A_UINT8 *) &args[1], + *((A_UINT8 *) &args[1] + 1), + *((A_UINT8 *) &args[1] + 2), + *((A_UINT8 *) &args[1] + 3), + *(A_UINT8 *) &args[2], + *((A_UINT8 *) &args[2] + 1), + *((A_UINT8 *) &args[2] + 2), + *((A_UINT8 *) &args[2] + 3), + *(A_UINT8 *) &args[3], + *((A_UINT8 *) &args[3] + 1), + *((A_UINT8 *) &args[3] + 2), + *((A_UINT8 *) &args[3] + 3)); } else { return false; } @@ -4211,11 +4235,23 @@ dbglog_wow_print_handler(A_UINT32 mod_id, case WOW_NS_REPLIED: if (4 == numargs) { dbglog_printf(timestamp, vap_id, - "NS replied to %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), - *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), - *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), - *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); + "NS replied to %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", + *(A_UINT8 *) &args[0], + *((A_UINT8 *) &args[0] + 1), + *((A_UINT8 *) &args[0] + 2), + *((A_UINT8 *) &args[0] + 3), + *(A_UINT8 *) &args[1], + *((A_UINT8 *) &args[1] + 1), + *((A_UINT8 *) &args[1] + 2), + *((A_UINT8 *) &args[1] + 3), + *(A_UINT8 *) &args[2], + *((A_UINT8 *) &args[2] + 1), + *((A_UINT8 *) &args[2] + 2), + *((A_UINT8 *) &args[2] + 3), + *(A_UINT8 *) &args[3], + *((A_UINT8 *) &args[3] + 1), + *((A_UINT8 *) &args[3] + 2), + *((A_UINT8 *) &args[3] + 3)); } else { return false; } -- cgit v1.2.3