Merge pull request #5116 from hasnainvirk/iar_fix

theotherjimmy · web-flow · commit a0d55036f9b3 · 2017-09-18T09:30:59.000-05:00
Separate string literal from macro
diff --git a/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp b/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp
@@ -141,7 +141,7 @@ static void CMT_URC(ATCmdParser *at)
 
 static bool set_atd(ATCmdParser *at)
 {
-    bool success = at->send("ATD*99***" CTX"#") && at->recv("CONNECT");
+    bool success = at->send("ATD*99***" CTX "#") && at->recv("CONNECT");
 
     return success;
 }
@@ -469,7 +469,7 @@ nsapi_error_t PPPCellularInterface::setup_context_and_credentials()
 #endif
     success = _at->send("AT"
                           "+FCLASS=0;" // set to connection (ATD) to data mode
-                          "+CGDCONT=" CTX",\"%s\",\"%s%s\"",
+                          "+CGDCONT=" CTX ",\"%s\",\"%s%s\"",
                           pdp_type, auth, _apn
                          )
                    && _at->recv("OK");

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ static void CMT_URC(ATCmdParser *at)`
`141`	`141`
`142`	`142`	`static bool set_atd(ATCmdParser *at)`
`143`	`143`	`{`
`144`		`- bool success = at->send("ATD99**" CTX"#") && at->recv("CONNECT");`
	`144`	`+ bool success = at->send("ATD99**" CTX "#") && at->recv("CONNECT");`
`145`	`145`
`146`	`146`	`return success;`
`147`	`147`	`}`
`@@ -469,7 +469,7 @@ nsapi_error_t PPPCellularInterface::setup_context_and_credentials()`
`469`	`469`	`#endif`
`470`	`470`	`success = _at->send("AT"`
`471`	`471`	`"+FCLASS=0;" // set to connection (ATD) to data mode`
`472`		`- "+CGDCONT=" CTX",\"%s\",\"%s%s\"",`
	`472`	`+ "+CGDCONT=" CTX ",\"%s\",\"%s%s\"",`
`473`	`473`	`pdp_type, auth, _apn`
`474`	`474`	`)`
`475`	`475`	`&& _at->recv("OK");`