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

mraa.c: remove surplus variables, correct memory allocations

Browse Source 
Signed-off-by: Alex Tereschenko <alext.mkrs@gmail.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Alex Tereschenko
2017-05-20 13:17:05 +02:00
committed by Brendan Le Foll
parent 56d5666ae9
commit 69f7d09103
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mraa.c
View File

@@ -108,7 +108,6 @@ imraa_init()
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }
char* env_var; char* env_var;
mraa_result_t ret;
mraa_platform_t platform_type = MRAA_NULL_PLATFORM; mraa_platform_t platform_type = MRAA_NULL_PLATFORM;
uid_t proc_euid = geteuid(); uid_t proc_euid = geteuid();
struct passwd* proc_user = getpwuid(proc_euid); struct passwd* proc_user = getpwuid(proc_euid);
@@ -127,7 +126,7 @@ imraa_init()
env_var = getenv(MRAA_JSONPLAT_ENV_VAR); env_var = getenv(MRAA_JSONPLAT_ENV_VAR);
if (env_var != NULL) { if (env_var != NULL) {
// We only care about success, the init will write to syslog if things went wrong // We only care about success, the init will write to syslog if things went wrong
switch ((ret = mraa_init_json_platform(env_var))) { switch (mraa_init_json_platform(env_var)) {
case MRAA_SUCCESS: case MRAA_SUCCESS:
platform_type = plat->platform_type; platform_type = plat->platform_type;
break; break;
@@ -1012,16 +1011,11 @@ mraa_file_contains(const char* filename, const char* content)
char* file = mraa_file_unglob(filename); char* file = mraa_file_unglob(filename);
if (file != NULL) { if (file != NULL) {
size_t len = 1024; size_t len = 0;
char* line = calloc(len, sizeof(char)); char* line = NULL;
if (line == NULL) {
free(file);
return 0;
}
FILE* fh = fopen(file, "r"); FILE* fh = fopen(file, "r");
if (fh == NULL) { if (fh == NULL) {
free(file); free(file);
free(line);
return 0; return 0;
} }
while ((getline(&line, &len, fh) != -1) && (found == 0)) { while ((getline(&line, &len, fh) != -1) && (found == 0)) {
@@ -1047,16 +1041,11 @@ mraa_file_contains_both(const char* filename, const char* content, const char* c
char* file = mraa_file_unglob(filename); char* file = mraa_file_unglob(filename);
if (file != NULL) { if (file != NULL) {
size_t len = 1024; size_t len = 0;
char* line = calloc(len, sizeof(char)); char* line = NULL;
if (line == NULL) {
free(file);
return 0;
}
FILE* fh = fopen(file, "r"); FILE* fh = fopen(file, "r");
if (fh == NULL) { if (fh == NULL) {
free(file); free(file);
free(line);
return 0; return 0;
} }
while ((getline(&line, &len, fh) != -1) && (found == 0)) { while ((getline(&line, &len, fh) != -1) && (found == 0)) {
@@ -1188,14 +1177,10 @@ mraa_find_i2c_bus(const char* devname, int startfrom)
{ {
char path[64]; char path[64];
int fd; int fd;
int i = startfrom;
int ret = -1;
// because feeding mraa_find_i2c_bus result back into the function is // because feeding mraa_find_i2c_bus result back into the function is
// useful treat -1 as 0 // useful treat -1 as 0
if (startfrom < 0) { int i = (startfrom < 0) ? 0 : startfrom;
startfrom = 0; int ret = -1;
}
// find how many i2c buses we have if we haven't already // find how many i2c buses we have if we haven't already
if (num_i2c_devices == 0) { if (num_i2c_devices == 0) {