Diff: Arguments.cpp

Revision:

1:96ac4b2bbd64

Parent:

0:efe8172b4113

--- a/Arguments.cpp	Tue Nov 20 17:23:59 2012 +0000
+++ b/Arguments.cpp	Fri Feb 15 13:35:22 2013 +0000
@@ -1,146 +1,157 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2012 ARM Limited
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include "Arguments.h"
-#include "pinmap.h"
-
-using namespace std;
-
-namespace mbed {
-
-Arguments::Arguments(const char* rqs) {
-    obj_name = NULL;
-    method_name = NULL;
-    argc = 0;
-    
-    // This copy can be removed if we can assume the request string is
-    // persistent and writable for the duration of the call
-    strcpy(request, rqs);
-    
-    // Initial '/'
-    char* p = request;
-    if (*p != '/') return;
-    p++;
-    
-    // Object Name
-    p = search_arg(&obj_name, p, '/');
-    if (p == NULL) return;
-    
-    // Method Name
-    p = search_arg(&method_name, p, ' ');
-    if (p == NULL) return;
-    
-    // Arguments
-    while (true) {
-        argv[argc] = NULL;
-        p = search_arg(&argv[argc], p, ' ');
-        if (argv[argc] != NULL) argc++;
-        if (p == NULL) break;
-    }
-    
-    index = -1;
-}
-
-char* Arguments::search_arg(char **arg, char *p, char next_sep) {
-    char *s = p;
-    while (true) {
-        if ((*p == '/') || (*p == ' ') || (*p == '\n') || (*p == '\0')) break;
-        p++;
-    }
-    if (p == s) return NULL;
-    *arg = s;
-    char separator = *p;
-    *p = '\0';
-    p++;
-    return (separator == next_sep) ? (p) : (NULL);
-}
-
-template<> PinName Arguments::getArg<PinName>(void) {
-    index++;
-    return parse_pins(argv[index]);
-}
-
-template<> int Arguments::getArg<int>(void) {
-    index++;
-    char *pEnd;
-    return strtol(argv[index], &pEnd, 10);
-}
-
-template<> const char* Arguments::getArg<const char*>(void) {
-    index++;
-    return argv[index];
-}
-
-template<> char Arguments::getArg<char>(void) {
-    index++;
-    return *argv[index];
-}
-
-template<> double Arguments::getArg<double>(void) {
-    index++;
-    return atof(argv[index]);
-}
-
-template<> float Arguments::getArg<float>(void) {
-    index++;
-    return atof(argv[index]);
-}
-
-Reply::Reply(char* r) {
-    first = true;
-    *r = '\0';
-    reply = r;
-}
-
-void Reply::separator(void) {
-    if (first) {
-        first = false;
-    } else {
-        *reply = ' '; reply++;
-    }
-}
-
-template<> void Reply::putData<const char*>(const char* s) {
-    separator();
-    reply += sprintf(reply, "%s", s);
-}
-
-template<> void Reply::putData<char*>(char* s) {
-    separator();
-    reply += sprintf(reply, "%s", s);
-}
-
-template<> void Reply::putData<char>(char c) {
-    separator();
-    reply += sprintf(reply, "%c", c);
-}
-
-template<> void Reply::putData<int>(int v) {
-    separator();
-    reply += sprintf(reply, "%d", v);
-}
-
-template<> void Reply::putData<float>(float f) {
-    separator();
-    reply += sprintf(reply, "%.17g", f);
-}
-
-} // namespace mbed
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2012 ARM Limited
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "Arguments.h"
+#include "pinmap.h"
+
+using namespace std;
+
+namespace mbed {
+
+Arguments::Arguments(const char* rqs) {
+    obj_name = NULL;
+    method_name = NULL;
+    argc = 0;
+    
+    // This copy can be removed if we can assume the request string is
+    // persistent and writable for the duration of the call
+    strcpy(request, rqs);
+    
+    // Initial '/'
+    char* p = request;
+    if (*p != '/') return;
+    p++;
+    
+    // Object Name
+    p = search_arg(&obj_name, p, '/');
+    if (p == NULL) return;
+    
+    // Method Name
+    p = search_arg(&method_name, p, ' ');
+    if (p == NULL) return;
+    
+    // Arguments
+    while (true) {
+        argv[argc] = NULL;
+        p = search_arg(&argv[argc], p, ' ');
+        if (argv[argc] != NULL) argc++;
+        if (p == NULL) break;
+    }
+    
+    index = -1;
+}
+
+char* Arguments::search_arg(char **arg, char *p, char next_sep) {
+    char *s = p;
+    while (true) {
+        if ((*p == '/') || (*p == ' ') || (*p == '\n') || (*p == '\0')) break;
+        p++;
+    }
+    if (p == s) return NULL;
+    *arg = s;
+    char separator = *p;
+    *p = '\0';
+    p++;
+    return (separator == next_sep) ? (p) : (NULL);
+}
+
+template<> PinName Arguments::getArg<PinName>(void) {
+    index++;
+    return parse_pins(argv[index]);
+}
+
+template<> int Arguments::getArg<int>(void) {
+    index++;
+    char *pEnd;
+    return strtol(argv[index], &pEnd, 10);
+}
+
+template<> unsigned short Arguments::getArg<unsigned short>(void) {
+    index++;
+    char *pEnd;
+    return strtol(argv[index], &pEnd, 10);
+}
+
+template<> const char* Arguments::getArg<const char*>(void) {
+    index++;
+    return argv[index];
+}
+
+template<> char Arguments::getArg<char>(void) {
+    index++;
+    return *argv[index];
+}
+
+template<> double Arguments::getArg<double>(void) {
+    index++;
+    return atof(argv[index]);
+}
+
+template<> float Arguments::getArg<float>(void) {
+    index++;
+    return atof(argv[index]);
+}
+
+Reply::Reply(char* r) {
+    first = true;
+    *r = '\0';
+    reply = r;
+}
+
+void Reply::separator(void) {
+    if (first) {
+        first = false;
+    } else {
+        *reply = ' '; reply++;
+    }
+}
+
+template<> void Reply::putData<const char*>(const char* s) {
+    separator();
+    reply += sprintf(reply, "%s", s);
+}
+
+template<> void Reply::putData<char*>(char* s) {
+    separator();
+    reply += sprintf(reply, "%s", s);
+}
+
+template<> void Reply::putData<char>(char c) {
+    separator();
+    reply += sprintf(reply, "%c", c);
+}
+
+template<> void Reply::putData<int>(int v) {
+    separator();
+    reply += sprintf(reply, "%d", v);
+}
+
+template<> void Reply::putData<unsigned short>(unsigned short v) {
+    separator();
+    reply += sprintf(reply, "%u", v);
+}
+
+template<> void Reply::putData<float>(float f) {
+    separator();
+    reply += sprintf(reply, "%.17g", f);
+}
+
+} // namespace mbed