[fix] fix compile warning with c++ (nps)

paparazzi · Oct 23, 2013 · 3717ead · 3717ead
1 parent bc38481
commit 3717ead
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/sw/airborne/subsystems/datalink/telemetry.c b/sw/airborne/subsystems/datalink/telemetry.c
@@ -35,7 +35,7 @@
  * @param _cb callback function, called according to telemetry mode and specified period
  * @return TRUE if message registered with success, FALSE otherwise
  */
-bool_t register_periodic_telemetry(struct pprz_telemetry * _pt, char * _msg, telemetry_cb _cb) {
+bool_t register_periodic_telemetry(struct pprz_telemetry * _pt, const char * _msg, telemetry_cb _cb) {
   // look for message name
   uint8_t i;
   for (i = 0; i < _pt->nb; i++) {

diff --git a/sw/airborne/subsystems/datalink/telemetry_common.h b/sw/airborne/subsystems/datalink/telemetry_common.h
@@ -58,7 +58,7 @@ struct pprz_telemetry {
  * @param _cb callback function, called according to telemetry mode and specified period
  * @return TRUE if message registered with success, FALSE otherwise
  */
-extern bool_t register_periodic_telemetry(struct pprz_telemetry * _pt, char * _msg, telemetry_cb _cb);
+extern bool_t register_periodic_telemetry(struct pprz_telemetry * _pt, const char * _msg, telemetry_cb _cb);
 
 #if USE_PERIODIC_TELEMETRY_REPORT
 /** Send an error report when trying to send message that as not been register

diff --git a/sw/include/std.h b/sw/include/std.h
@@ -239,10 +239,11 @@ typedef uint8_t unit_t;
     }									\
   }
 
-static inline bool_t str_equal(char * a, char * b) {
-  while (!(*a == 0 && *b == 0)) {
-    if (*a != *b) return FALSE;
-    a++; b++;
+static inline bool_t str_equal(const char * a, const char * b) {
+  int i = 0;
+  while (!(a[i] == 0 && b[i] == 0)) {
+    if (a[i] != b[i]) return FALSE;
+    i++;
   }
   return TRUE;
 }