Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

clang-format: reapply to recently modified sources

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu
2019-03-06 13:14:09 -08:00
parent 41fc378099
commit 7f8d3876e3
3 changed files with 182 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/json/jsonplatform.c
View File

@@ -23,14 +23,14 @@
*/
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <json-c/json.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include "mraa_internal.h"
@@ -64,9 +64,8 @@ mraa_init_json_platform_get_index(json_object* jobj, const char* io, const char*
*pos = (int) json_object_get_int(jobj_temp);
if (*pos < 0 || *pos > upper) {
syslog(LOG_ERR,
"init_json_platform: %s %s at position: %d, gave: %d which was out of range", io,
key, index, *pos);
syslog(LOG_ERR, "init_json_platform: %s %s at position: %d, gave: %d which was out of range",
io, key, index, *pos);
return MRAA_ERROR_INVALID_RESOURCE;
}
return MRAA_SUCCESS;
@@ -291,7 +290,7 @@ mraa_init_json_platform_i2c(json_object* jobj_i2c, mraa_board_t* board, int inde
json_object* jobj_temp = NULL;
// Default to no mux pins defined
if(board->pins != NULL) {
if (board->pins != NULL) {
board->pins[pin].i2c.mux_total = 0;
} else {
return MRAA_ERROR_NO_DATA_AVAILABLE;
@@ -559,8 +558,9 @@ mraa_init_json_platform_loop(json_object* jobj_platform, const char* obj_key, mr
jobj_io = json_object_array_get_idx(jobj_temp, i);
// Check to see it's the right type
if (!json_object_is_type(jobj_io, json_type_object)) {
syslog(LOG_ERR, "init_json_platform: One of more of the elements in the \"%s\" "
"array where not JSON objects",
syslog(LOG_ERR,
"init_json_platform: One of more of the elements in the \"%s\" "
"array where not JSON objects",
obj_key);
return MRAA_ERROR_INVALID_RESOURCE;
}
@@ -595,8 +595,7 @@ mraa_init_json_platform_size_check(json_object* jobj_platform,
// make sure we don't have more than our range
array_length = json_object_array_length(jobj_temp);
if (array_length > range) {
syslog(LOG_ERR,
"init_json_platform: The size of the %s array given was %d, max was: %d",
syslog(LOG_ERR, "init_json_platform: The size of the %s array given was %d, max was: %d",
obj_key, array_length, range);
return MRAA_ERROR_INVALID_RESOURCE;
}
@@ -617,7 +616,7 @@ mraa_init_json_platform(const char* platform_json)
char* buffer = NULL;
struct stat st;
int file_lock = 0, i = 0;
json_object *jobj_platform = NULL;
json_object* jobj_platform = NULL;
mraa_board_t* board = NULL;
// Try to lock the file for use