Diff: internal/wiconnect/ProcessCommand.cpp

Revision:

24:e27e23297f02

Parent:

21:17bb3eddcbae

--- a/internal/wiconnect/ProcessCommand.cpp	Sat Sep 06 14:24:03 2014 -0700
+++ b/internal/wiconnect/ProcessCommand.cpp	Sat Sep 06 20:34:01 2014 -0700
@@ -1,30 +1,30 @@
-/**
- * ACKme WiConnect Host Library is licensed under the BSD licence: 
- * 
- * Copyright (c)2014 ACKme Networks.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met: 
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 3. The name of the author may not be used to endorse or promote products 
- * derived from this software without specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
- * OF SUCH DAMAGE.
+/**
+ * ACKme WiConnect Host Library is licensed under the BSD licence: 
+ * 
+ * Copyright (c)2014 ACKme Networks.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met: 
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 3. The name of the author may not be used to endorse or promote products 
+ * derived from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
  */
 
 #include "CommandCommon.h"
@@ -145,10 +145,10 @@
             }
             else if(header->response_len > 0)
             {
-                DEBUG_CMD_RESPONSE(context->responseBuffer);
-                if(header->response_len < context->responseBufferLen)
+                DEBUG_CMD_RESPONSE(context->responseBuffer);
+                if(header->response_len < context->responseBufferLen)
                 {
-                    context->responseBuffer[header->response_len] = 0;
+                    context->responseBuffer[header->response_len] = 0;
                 }
             }
             else
@@ -242,14 +242,14 @@
                             RESET_CMD_HEADER(header);
                         }
                         else
-                        {
-                            if(packetLen > 0)
-                            {
-                                if(packetLen == 1 || packetLen == 2)
-                                {
-                                    return WICONNECT_CMD_RESPONSE_ERROR;
-                                }
-                                packetLen -= 2;
+                        {
+                            if(packetLen > 0)
+                            {
+                                if(packetLen == 1 || packetLen == 2)
+                                {
+                                    return WICONNECT_CMD_RESPONSE_ERROR;
+                                }
+                                packetLen -= 2;
                             }
                             if((int)packetLen > context->responseBufferLen)
                             {
@@ -304,15 +304,15 @@
         }
         else if(context->bytesToRead == 0)
         {
-            *context->responseBufferPtr = 0;
-
-            // read the trailing \r\n
-            char trailingCRLF[2];
-            const int bytesReceived = serial.read(trailingCRLF, 2, 100);
-            // FIXME there's a potenital weakness where the trailing \r\n isn't ready to be recieved
-            if(bytesReceived != 2)
-            {
-                return WICONNECT_TIMEOUT;
+            *context->responseBufferPtr = 0;
+
+            // read the trailing \r\n
+            char trailingCRLF[2];
+            const int bytesReceived = serial.read(trailingCRLF, 2, 100);
+            // FIXME there's a potenital weakness where the trailing \r\n isn't ready to be recieved
+            if(bytesReceived != 2)
+            {
+                return WICONNECT_TIMEOUT;
             }
         }
     }