Merge pull request #9681 from NeilMacMullen/cross-compilation

Cruz Monrreal · web-flow · commit e34ecae6c273 · 2019-02-13T17:10:23.000-06:00
Make a few trivial syntactic changes to better support cross-compilation
diff --git a/features/cellular/framework/AT/AT_CellularDevice.cpp b/features/cellular/framework/AT/AT_CellularDevice.cpp
@@ -207,7 +207,7 @@ CellularContext *AT_CellularDevice::create_context(FileHandle *fh, const char *a
         return ctx;
     }
 
-    AT_CellularContext *prev;
+    AT_CellularContext *prev = NULL;
     while (curr) {
         prev = curr;
         curr = (AT_CellularContext *)curr->_next;
diff --git a/features/cellular/framework/AT/AT_CellularSMS.cpp b/features/cellular/framework/AT/AT_CellularSMS.cpp
@@ -990,7 +990,7 @@ void AT_CellularSMS::add_info(sms_info_t *info, int index, int part_number)
         return;
     }
     sms_info_t *current = _sms_info;
-    sms_info_t *prev;
+    sms_info_t *prev = NULL;
     bool found_msg = false;
     while (current) {
         prev = current;
diff --git a/features/cellular/framework/common/CellularLog.cpp b/features/cellular/framework/common/CellularLog.cpp
@@ -26,10 +26,7 @@ typedef struct trace_s {
     void (*mutex_release_f)(void);
 } trace_t;
 
-static trace_t m_trace = {
-    .mutex_wait_f = 0,
-    .mutex_release_f = 0,
-};
+static trace_t m_trace = {};
 
 void mutex_wait_function_set(void (*mutex_wait_f)(void))
 {

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ CellularContext AT_CellularDevice::create_context(FileHandle fh, const char *a`
`207`	`207`	`return ctx;`
`208`	`208`	`}`
`209`	`209`
`210`		`- AT_CellularContext *prev;`
	`210`	`+ AT_CellularContext *prev = NULL;`
`211`	`211`	`while (curr) {`
`212`	`212`	`prev = curr;`
`213`	`213`	`curr = (AT_CellularContext *)curr->_next;`
Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,7 @@ void AT_CellularSMS::add_info(sms_info_t *info, int index, int part_number)`
`990`	`990`	`return;`
`991`	`991`	`}`
`992`	`992`	`sms_info_t *current = _sms_info;`
`993`		`- sms_info_t *prev;`
	`993`	`+ sms_info_t *prev = NULL;`
`994`	`994`	`bool found_msg = false;`
`995`	`995`	`while (current) {`
`996`	`996`	`prev = current;`