From 9b59519a6e90f31d8b5fc90cacb2e168c9f13052 Mon Sep 17 00:00:00 2001 From: YGator Date: Thu, 11 Feb 2016 22:22:50 -0500 Subject: [PATCH 1/3] Remove some compiler warnings --- src/data.c | 2 +- src/devices/x10_rf.c | 2 +- src/rtl_433.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/data.c mode change 100644 => 100755 src/devices/x10_rf.c mode change 100644 => 100755 src/rtl_433.c diff --git a/src/data.c b/src/data.c old mode 100644 new mode 100755 index 3910bbcb..2cd90760 --- a/src/data.c +++ b/src/data.c @@ -423,7 +423,7 @@ static void print_kv_data(data_printer_context_t *printer_ctx, data_t *data, cha } } if (!strcmp(data->key, "time")) - fprintf(file, ""); + ; else if (!strcmp(data->key, "model")) fprintf(file, ":\t"); else diff --git a/src/devices/x10_rf.c b/src/devices/x10_rf.c old mode 100644 new mode 100755 index 810d6cf7..1872106f --- a/src/devices/x10_rf.c +++ b/src/devices/x10_rf.c @@ -17,7 +17,7 @@ static int X10_RF_callback(bitbuffer_t *bitbuffer) { // Validate package if ((bitbuffer->bits_per_row[1] == 32) // Dont waste time on a short package // && (bb[1][0] == (uint8_t)(~bb[1][1])) // Check integrity - apparently some chips may use both bytes.. - && (bb[1][2] == (uint8_t)(~bb[1][3])) // Check integrity + && (bb[1][2] == (255 - bb[1][3])) // Check integrity ) { fprintf(stdout, "X10 RF:\n"); diff --git a/src/rtl_433.c b/src/rtl_433.c old mode 100644 new mode 100755 index ed8a6a29..92f2a7b5 --- a/src/rtl_433.c +++ b/src/rtl_433.c @@ -797,7 +797,7 @@ int main(int argc, char **argv) { char *in_filename = NULL; FILE *in_file; int n_read; - int r, opt; + int r = 0, opt; int i, gain = 0; int sync_mode = 0; int ppm_error = 0; From 9c2e7b0826e99eccd3e62f6493b1b730e19c9ad3 Mon Sep 17 00:00:00 2001 From: YGator Date: Sat, 13 Feb 2016 14:00:42 -0500 Subject: [PATCH 2/3] Remove some compiler warnings --- src/data.c | 2 +- src/devices/x10_rf.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data.c b/src/data.c index 2cd90760..25a7728c 100755 --- a/src/data.c +++ b/src/data.c @@ -423,7 +423,7 @@ static void print_kv_data(data_printer_context_t *printer_ctx, data_t *data, cha } } if (!strcmp(data->key, "time")) - ; + /* fprintf(file, "") */ ; else if (!strcmp(data->key, "model")) fprintf(file, ":\t"); else diff --git a/src/devices/x10_rf.c b/src/devices/x10_rf.c index 1872106f..4d48b168 100755 --- a/src/devices/x10_rf.c +++ b/src/devices/x10_rf.c @@ -17,6 +17,7 @@ static int X10_RF_callback(bitbuffer_t *bitbuffer) { // Validate package if ((bitbuffer->bits_per_row[1] == 32) // Dont waste time on a short package // && (bb[1][0] == (uint8_t)(~bb[1][1])) // Check integrity - apparently some chips may use both bytes.. + // (255 - bb[1][3]) is equivalent to ~bb[1][3] but does not cause compiler warning && (bb[1][2] == (255 - bb[1][3])) // Check integrity ) { From 9f13efc983747551fbe76f72967fd06f300495a0 Mon Sep 17 00:00:00 2001 From: YGator Date: Sat, 13 Feb 2016 20:36:37 -0500 Subject: [PATCH 3/3] Remove some compiler warnings --- src/devices/x10_rf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/devices/x10_rf.c b/src/devices/x10_rf.c index 4d48b168..b01ffeca 100755 --- a/src/devices/x10_rf.c +++ b/src/devices/x10_rf.c @@ -17,8 +17,7 @@ static int X10_RF_callback(bitbuffer_t *bitbuffer) { // Validate package if ((bitbuffer->bits_per_row[1] == 32) // Dont waste time on a short package // && (bb[1][0] == (uint8_t)(~bb[1][1])) // Check integrity - apparently some chips may use both bytes.. - // (255 - bb[1][3]) is equivalent to ~bb[1][3] but does not cause compiler warning - && (bb[1][2] == (255 - bb[1][3])) // Check integrity + && (bb[1][2] == ((0xff & (~bb[1][3])))) // Check integrity ) { fprintf(stdout, "X10 RF:\n");