summaryrefslogtreecommitdiff
path: root/src/kpi/dlt-kpi-common.c
diff options
context:
space:
mode:
authorChristoph Lipka <clipka@de.adit-jv.com>2018-12-20 14:58:19 +0100
committerChristoph Lipka <clipka@de.adit-jv.com>2018-12-21 10:23:41 +0100
commitdca8ab254aa0a687c32009079d85e4d8f960b213 (patch)
treee63b6a552fd9f61873892110a56a89ef354864cd /src/kpi/dlt-kpi-common.c
parent0d0c74640c8b792db37cb9f884f89f7561ea551f (diff)
downloadDLT-daemon-dca8ab254aa0a687c32009079d85e4d8f960b213.tar.gz
Code beautification using uncrustify
Signed-off-by: Christoph Lipka <clipka@de.adit-jv.com>
Diffstat (limited to 'src/kpi/dlt-kpi-common.c')
-rw-r--r--src/kpi/dlt-kpi-common.c59
1 files changed, 27 insertions, 32 deletions
diff --git a/src/kpi/dlt-kpi-common.c b/src/kpi/dlt-kpi-common.c
index fa131dc..53298b1 100644
--- a/src/kpi/dlt-kpi-common.c
+++ b/src/kpi/dlt-kpi-common.c
@@ -30,19 +30,18 @@ static int dlt_kpi_cpu_count = -1;
DltReturnValue dlt_kpi_read_file_compact(char *filename, char **target)
{
- if(filename == NULL || target == NULL)
- {
- fprintf(stderr, "%s: Nullpointer parameter!\n",__func__);
+ if ((filename == NULL) || (target == NULL)) {
+ fprintf(stderr, "%s: Nullpointer parameter!\n", __func__);
return DLT_RETURN_WRONG_PARAMETER;
}
- char buffer[BUFFER_SIZE];
+ char buffer[BUFFER_SIZE];
int ret = dlt_kpi_read_file(filename, buffer, BUFFER_SIZE);
- if(ret < DLT_RETURN_OK)
+
+ if (ret < DLT_RETURN_OK)
return ret;
- if((*target = malloc(strlen(buffer) + 1)) == NULL)
- {
+ if ((*target = malloc(strlen(buffer) + 1)) == NULL) {
fprintf(stderr, "Out of memory!\n");
return DLT_RETURN_ERROR;
}
@@ -52,22 +51,20 @@ DltReturnValue dlt_kpi_read_file_compact(char *filename, char **target)
return DLT_RETURN_OK;
}
-DltReturnValue dlt_kpi_read_file(char* filename, char* buffer, uint maxLength)
+DltReturnValue dlt_kpi_read_file(char *filename, char *buffer, uint maxLength)
{
- if(filename == NULL || buffer == NULL)
- {
- fprintf(stderr, "%s: Nullpointer parameter!\n",__func__);
+ if ((filename == NULL) || (buffer == NULL)) {
+ fprintf(stderr, "%s: Nullpointer parameter!\n", __func__);
return DLT_RETURN_WRONG_PARAMETER;
}
- FILE* file = fopen(filename, "r");
- if(file == NULL)
- {
- // fprintf(stderr, "Could not read file %s\n", filename);
+ FILE *file = fopen(filename, "r");
+
+ if (file == NULL)
+ /* fprintf(stderr, "Could not read file %s\n", filename); */
return DLT_RETURN_ERROR;
- }
- int buflen = fread(buffer, 1, maxLength-1, file);
+ int buflen = fread(buffer, 1, maxLength - 1, file);
buffer[buflen] = '\0';
fclose(file);
@@ -79,40 +76,38 @@ int dlt_kpi_read_cpu_count()
{
char buffer[BUFFER_SIZE];
int ret = dlt_kpi_read_file("/proc/cpuinfo", buffer, sizeof(buffer));
- if(ret != 0)
- {
+
+ if (ret != 0) {
fprintf(stderr, "dlt_kpi_get_cpu_count(): Could not read /proc/cpuinfo\n");
return -1;
}
- char* delim = "[] \t\n";
- char* tok = strtok(buffer, delim);
- if(tok == NULL)
- {
+ char *delim = "[] \t\n";
+ char *tok = strtok(buffer, delim);
+
+ if (tok == NULL) {
fprintf(stderr, "dlt_kpi_get_cpu_count(): Could not extract token\n");
return -1;
}
int num = 0;
- do
- {
- if(strcmp(tok, "processor") == 0)
+
+ do {
+ if (strcmp(tok, "processor") == 0)
num++;
tok = strtok(NULL, delim);
- }
- while(tok != NULL);
+ } while (tok != NULL);
return num;
}
int dlt_kpi_get_cpu_count()
{
- if(dlt_kpi_cpu_count <= 0)
- {
+ if (dlt_kpi_cpu_count <= 0) {
dlt_kpi_cpu_count = dlt_kpi_read_cpu_count();
- if(dlt_kpi_cpu_count <= 0)
- {
+
+ if (dlt_kpi_cpu_count <= 0) {
fprintf(stderr, "Could not get CPU count\n");
dlt_kpi_cpu_count = -1;
}