Diff: platform/ATCmdParser.cpp

Revision:

189:f392fc9709a3

Parent:

188:bcfe06ba3d64

diff -r bcfe06ba3d64 -r f392fc9709a3 platform/ATCmdParser.cpp
--- a/platform/ATCmdParser.cpp	Thu Nov 08 11:46:34 2018 +0000
+++ b/platform/ATCmdParser.cpp	Wed Feb 20 22:31:08 2019 +0000
@@ -1,4 +1,5 @@
 /* Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,9 @@
 #include "ATCmdParser.h"
 #include "mbed_poll.h"
 #include "mbed_debug.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef LF
 #undef LF
@@ -36,6 +40,8 @@
 #define CR  13
 #endif
 
+namespace mbed {
+
 // getc/putc handling with timeouts
 int ATCmdParser::putc(char c)
 {
@@ -102,7 +108,7 @@
 
 
 // printf/scanf handling
-int ATCmdParser::vprintf(const char *format, va_list args)
+int ATCmdParser::vprintf(const char *format, std::va_list args)
 {
 
     if (vsprintf(_buffer, format, args) < 0) {
@@ -118,7 +124,7 @@
     return i;
 }
 
-int ATCmdParser::vscanf(const char *format, va_list args)
+int ATCmdParser::vscanf(const char *format, std::va_list args)
 {
     // Since format is const, we need to copy it into our buffer to
     // add the line's null terminator and clobber value-matches with asterisks.
@@ -181,7 +187,7 @@
 
 
 // Command parsing with line handling
-bool ATCmdParser::vsend(const char *command, va_list args)
+bool ATCmdParser::vsend(const char *command, std::va_list args)
 {
     // Create and send command
     if (vsprintf(_buffer, command, args) < 0) {
@@ -205,7 +211,7 @@
     return true;
 }
 
-bool ATCmdParser::vrecv(const char *response, va_list args)
+bool ATCmdParser::vrecv(const char *response, std::va_list args)
 {
 restart:
     _aborted = false;
@@ -338,7 +344,7 @@
 // Mapping to vararg functions
 int ATCmdParser::printf(const char *format, ...)
 {
-    va_list args;
+    std::va_list args;
     va_start(args, format);
     int res = vprintf(format, args);
     va_end(args);
@@ -347,7 +353,7 @@
 
 int ATCmdParser::scanf(const char *format, ...)
 {
-    va_list args;
+    std::va_list args;
     va_start(args, format);
     int res = vscanf(format, args);
     va_end(args);
@@ -356,7 +362,7 @@
 
 bool ATCmdParser::send(const char *command, ...)
 {
-    va_list args;
+    std::va_list args;
     va_start(args, command);
     bool res = vsend(command, args);
     va_end(args);
@@ -365,7 +371,7 @@
 
 bool ATCmdParser::recv(const char *response, ...)
 {
-    va_list args;
+    std::va_list args;
     va_start(args, response);
     bool res = vrecv(response, args);
     va_end(args);
@@ -395,4 +401,5 @@
     return _oob_cb_count != pre_count;
 }
 
+}