From 9ffd1a4e559cd901d74e0e4421fc1a56714483b3 Mon Sep 17 00:00:00 2001 From: NADAL Jean-Baptiste Date: Mon, 13 Jan 2020 11:35:25 +0100 Subject: [PATCH] Fix indents troubles --- src/devices/device.c | 2 +- src/devices/devices_manager.c | 2 +- src/devices/devices_manager_internal.c | 6 +++--- src/devices/devices_manager_internal.h | 1 - src/devices/outlet_dio.c | 2 +- src/devices/shutter.c | 26 +++++++++++++------------- src/devices/shutter.h | 2 +- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/devices/device.c b/src/devices/device.c index 7d8eab1..5bc309b 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -89,7 +89,7 @@ int device_from_json(device_t *device, struct json_object *node) { int16_t id = -1; struct json_object *value_node; - + // id if (json_object_object_get_ex(node, k_entry_id, &value_node)) { diff --git a/src/devices/devices_manager.c b/src/devices/devices_manager.c index d1772c2..494744c 100644 --- a/src/devices/devices_manager.c +++ b/src/devices/devices_manager.c @@ -199,7 +199,7 @@ char *devices_manager_get(devices_manager_t *dm, const char *capability) if (capability == kOutletEntry) { - output_node = devices_manager_outlets_to_json_object(dm); + output_node = devices_manager_outlets_to_json_object(dm); } else if (capability == kShutterEntry) { diff --git a/src/devices/devices_manager_internal.c b/src/devices/devices_manager_internal.c index 7b1c984..cf4298f 100644 --- a/src/devices/devices_manager_internal.c +++ b/src/devices/devices_manager_internal.c @@ -242,7 +242,7 @@ struct json_object *devices_manager_outlets_to_json_object(devices_manager_t *dm while (qlist_getnext(dm->outlets, &obj, false)) { outlet = obj.data; - json_object_array_add(root_node, outlet_dio_to_json_object(outlet)); + json_object_array_add(root_node, outlet_dio_to_json_object(outlet)); } return root_node; @@ -444,7 +444,7 @@ struct json_object *devices_manager_shutters_to_json_object(devices_manager_t *d while (qlist_getnext(dm->shutters, &obj, false)) { shutter = obj.data; - json_object_array_add(root_node, shutter_to_json_object(shutter)); + json_object_array_add(root_node, shutter_to_json_object(shutter)); } return root_node; @@ -664,7 +664,7 @@ struct json_object *devices_manager_sprinklers_to_json_object(devices_manager_t while (qlist_getnext(dm->sprinklers, &obj, false)) { sprinkler = obj.data; - json_object_array_add(root_node, sprinkler_to_json_object(sprinkler)); + json_object_array_add(root_node, sprinkler_to_json_object(sprinkler)); } return root_node; diff --git a/src/devices/devices_manager_internal.h b/src/devices/devices_manager_internal.h index 18b3c66..ac17b60 100644 --- a/src/devices/devices_manager_internal.h +++ b/src/devices/devices_manager_internal.h @@ -36,7 +36,6 @@ struct json_object; /*--------------------------- PUBLIC FUNCTIONS -------------------------------*/ - /*-------------------------------- OUTLETS -----------------------------------*/ extern int load_outlets(devices_manager_t *dm, struct json_object *node); extern struct json_object *save_outlets(devices_manager_t *dm); diff --git a/src/devices/outlet_dio.c b/src/devices/outlet_dio.c index 9bbb677..f376b4a 100644 --- a/src/devices/outlet_dio.c +++ b/src/devices/outlet_dio.c @@ -128,7 +128,7 @@ int outlet_dio_to_json(outlet_dio_t *outlet, struct json_object *node) json_object_object_add(node, k_entry_zone, json_object_new_string(outlet->zone)); else json_object_object_add(node, k_entry_zone, json_object_new_string("")); - + // sender json_object_object_add(node, k_entry_sender, json_object_new_int(outlet->sender_id)); // switch diff --git a/src/devices/shutter.c b/src/devices/shutter.c index ee44a2c..f05a797 100644 --- a/src/devices/shutter.c +++ b/src/devices/shutter.c @@ -44,30 +44,30 @@ shutter_t *shutter_new(void) { - shutter_t *shutter = NEW_OBJECT(shutter_t); - if (shutter == NULL) - { - return NULL; - } + shutter_t *shutter = NEW_OBJECT(shutter_t); + if (shutter == NULL) + { + return NULL; + } - bzero((void *)shutter, sizeof(shutter_t)); + bzero((void *)shutter, sizeof(shutter_t)); - shutter->outlet_dio = outlet_dio_new(); + shutter->outlet_dio = outlet_dio_new(); - return shutter; + return shutter; } /*--------------------------------------------------------------------------*/ void shutter_free(shutter_t *shutter) { - if (shutter == NULL) - return; + if (shutter == NULL) + return; - if (shutter->outlet_dio != NULL) - outlet_dio_free(shutter->outlet_dio); + if (shutter->outlet_dio != NULL) + outlet_dio_free(shutter->outlet_dio); - free(shutter); + free(shutter); } /*--------------------------------------------------------------------------*/ diff --git a/src/devices/shutter.h b/src/devices/shutter.h index cb428b5..10ffca1 100644 --- a/src/devices/shutter.h +++ b/src/devices/shutter.h @@ -46,7 +46,7 @@ typedef struct shutter_s shutter_t; */ struct shutter_s { - outlet_dio_t *outlet_dio; + outlet_dio_t *outlet_dio; uint8_t speed_up; uint8_t speed_down; };