minor: Fix DATA_STRING should not have a DATA_FORMAT

merbanan · Mar 11, 2024 · ce30ff8 · ce30ff8
1 parent 82f6332
commit ce30ff8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/devices/directv.c b/src/devices/directv.c
@@ -349,7 +349,7 @@ static int directv_decode(r_device *decoder, bitbuffer_t *bitbuffer)
             "model",         "",            DATA_STRING, "DirecTV-RC66RX",
             "id",            "",            DATA_FORMAT, "%06d", DATA_INT, dtv_device_id,
             "button_id",     "",            DATA_FORMAT, "0x%02X", DATA_INT, dtv_button_id,
-            "button_name",   "",            DATA_FORMAT, "[%s]", DATA_STRING, get_dtv_button_label(dtv_button_id),
+            "button_name",   "",            DATA_STRING, get_dtv_button_label(dtv_button_id),
             "event",         "",            DATA_STRING, row_sync_len > ROW_SYNC_SHORT_LEN ? "INITIAL" : "REPEAT",
             "mic",           "Integrity",   DATA_STRING, "CHECKSUM",
             NULL);

diff --git a/src/devices/honeywell_wdb.c b/src/devices/honeywell_wdb.c
@@ -99,10 +99,10 @@ static int honeywell_wdb_callback(r_device *decoder, bitbuffer_t *bitbuffer)
     /* clang-format off */
     data = data_make(
             "model",         "",            DATA_STRING, "Honeywell-ActivLink",
-            "subtype",       "Class",       DATA_FORMAT, "%s",   DATA_STRING, class,
+            "subtype",       "Class",       DATA_STRING, class,
             "id",            "Id",          DATA_FORMAT, "%x",   DATA_INT,    device,
             "battery_ok",    "Battery",     DATA_INT,    !battery,
-            "alert",         "Alert",       DATA_FORMAT, "%s",   DATA_STRING, alert,
+            "alert",         "Alert",       DATA_STRING, alert,
             "secret_knock",  "Secret Knock",DATA_FORMAT, "%d",   DATA_INT,    secret_knock,
             "relay",         "Relay",       DATA_FORMAT, "%d",   DATA_INT,    relay,
             "mic",           "Integrity",   DATA_STRING, "PARITY",

diff --git a/src/devices/m_bus.c b/src/devices/m_bus.c
@@ -654,7 +654,7 @@ static int m_bus_decode_records(data_t *data, const uint8_t *b, uint8_t dif_codi
                     // Close sets bits 2 and 6 to 0
                     state = b[0]&0x44;
                     data = data_append(data,
-                            "switch", "Switch", DATA_FORMAT, "%s", DATA_STRING, (state==0x44) ? "open":"closed",
+                            "switch", "Switch", DATA_STRING, (state==0x44) ? "open":"closed",
                             NULL);
                     break;
                 case 0x3a: