[dahdi-commits] dahdi/linux.git branch "master" updated.

SVN commits to the DAHDI project dahdi-commits at lists.digium.com
Sun Jun 4 16:28:06 CDT 2017


branch "master" has been updated
       via  7ab8780c25a229b6034c61471f9339b709dc9963 (commit)
      from  76ad75fc2a6005d1a037fd0c26fa0ceff370f1fb (commit)

Summary of changes:
 drivers/dahdi/voicebus/GpakApi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 7ab8780c25a229b6034c61471f9339b709dc9963
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Sun Jun 4 16:14:39 2017 -0500

    GpakApi: Fix misleading indentation.
    
    gcc-6.3.1 reports the following error when building the driver suite:
    
        drivers/dahdi/voicebus/GpakApi.c: In function 'gpakReadDSPMemoryMap':
        drivers/dahdi/voicebus/GpakApi.c:1560:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
             if (DspStatus != 0)
             ^~
        drivers/dahdi/voicebus/GpakApi.c:1563:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
          for (i = 0; i < MemoryLength_Word16; i++)
          ^~~
    
    So we'll now update the indentation level (which appears to be a side effect of
    mixed tabs and spaces in this file).
    
    NOTE: The GpakAPI files are checkpatch.pl unclean because I did not want to
    increase the burden of merging in updates from the original provider, but it may
    be time to go ahead and bring the file in compliance with the kernel coding
    standards.
    
    Internal-Issue-ID: DAHLIN-354
    Reported-by: Sean Darcy
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

diff --git a/drivers/dahdi/voicebus/GpakApi.c b/drivers/dahdi/voicebus/GpakApi.c
index 26820a0..d65732b 100644
--- a/drivers/dahdi/voicebus/GpakApi.c
+++ b/drivers/dahdi/voicebus/GpakApi.c
@@ -1560,7 +1560,7 @@ gpakReadDSPMemoryStat_t gpakReadDSPMemoryMap(
     if (DspStatus != 0)
         return (RmmFailure);
 
-	for (i = 0; i < MemoryLength_Word16; i++)
+    for (i = 0; i < MemoryLength_Word16; i++)
         pDest[i] = (short int) MsgBuffer[2 + i];
 
 

-----------------------------------------------------------------------


-- 
dahdi/linux.git



More information about the dahdi-commits mailing list