diff --git a/src/amd_rapl.c b/src/amd_rapl.c index 9eaac45938a1ed0f9e44d68408f4a8796103e96e..572ac564693db3b4f5c221595a5f6629047d60d0 100644 --- a/src/amd_rapl.c +++ b/src/amd_rapl.c @@ -201,7 +201,7 @@ void debug_print_amd_rapl(AmdRapl *rapl) unsigned int get_nb_cpu() { char filename[BUFFER_SIZE]; - int cpy_errno; + int cpy_errno; unsigned int n_cpu = 0; for (;; n_cpu++) { @@ -215,22 +215,22 @@ unsigned int get_nb_cpu() close(fd); } - if (n_cpu == 0) { - perror("open()"); - fprintf(stderr, "on the file: '%s'\n", filename); - switch (cpy_errno) { - case ENOENT: - fprintf(stderr, "Amd rapl works with msr module, try to run 'sudo modprobe msr', then retry.\n"); - exit(99); - case EACCES: - fprintf(stderr, "Amd rapl must be executed with the administrator privilege, try with 'sudo'.\n"); - exit(98); - default: - fprintf(stderr, "Unexpected error\n"); - exit(97); - } - } - // n_cpu > 0 + if (n_cpu == 0) { + perror("open()"); + fprintf(stderr, "on the file: '%s'\n", filename); + switch (cpy_errno) { + case ENOENT: + fprintf(stderr, "Amd rapl works with msr module, try to run 'sudo modprobe msr', then retry.\n"); + exit(99); + case EACCES: + fprintf(stderr, "Amd rapl must be executed with the administrator privilege, try with 'sudo'.\n"); + exit(98); + default: + fprintf(stderr, "Unexpected error\n"); + exit(97); + } + } + // n_cpu > 0 return n_cpu; } diff --git a/src/network.c b/src/network.c index a668725dcd51825c2245c34b7ae387cd7125b294..fec9424365ee933537aae64c0fb7d41858908951 100644 --- a/src/network.c +++ b/src/network.c @@ -159,9 +159,9 @@ unsigned int init_network(char *dev, void **ptr) /* compare dev name to the previously saved one */ int newdev = 1; for (int i = 0; i < state->ndev && newdev; i++) { - if (strncmp(start_of_dev, state->devs[i], s - start_of_dev) == 0) { - newdev = 0; - } + if (strncmp(start_of_dev, state->devs[i], s - start_of_dev) == 0) { + newdev = 0; + } } if (newdev) { if (state->ndev >= NB_MAX_DEV) { diff --git a/tests/info_reader.c b/tests/info_reader.c index af2873c5baf5cfd911700d5c1892c6ca72955b4d..1e4f281f046adb9de795f945b69f38fb6f5b1f4d 100644 --- a/tests/info_reader.c +++ b/tests/info_reader.c @@ -287,7 +287,7 @@ TFUNCTION(test_match, { #define __NB_KEYS 4 typedef struct { - int values[__NB_KEYS]; + int values[__NB_KEYS]; } IntArray; GenericPointer __test_file_int_allocator(char *s) @@ -298,7 +298,7 @@ GenericPointer __test_file_int_allocator(char *s) void __test_file_set_int(GenericPointer storage, GenericPointer data) { - IntArray *array = (IntArray*) storage; + IntArray *array = (IntArray *) storage; int i = (int) data; array->values[i] = i; } @@ -319,11 +319,12 @@ TFUNCTION(test_dummy_file, { expected.values[3] = 3; Parser parser; - FILE* file = fopen("./tests/info_reader_test.txt", "r"); + FILE *file = fopen("./tests/info_reader_test.txt", "r"); INIT_PARSER(parser, (GenericPointer) &results, 0, 1, sizeof(IntArray), keys, __NB_KEYS, file); parse(&parser); - for (unsigned int i = 0; i < __NB_KEYS; i++) { + for (unsigned int i = 0; i < __NB_KEYS; i++) + { TEST_INT(&(results.values[i]), &(expected.values[i])); } fclose(file); diff --git a/tests/util.c b/tests/util.c index 231ab47487224a3f384d44f6b969be8fee2e25b4..ff979b943368f40dec153c955377dedf3d2cb3f6 100644 --- a/tests/util.c +++ b/tests/util.c @@ -78,45 +78,45 @@ TFUNCTION(test_modulo_substraction, { }) TFUNCTION(test_max, { - int expected = 0; - int result = 0; + int expected = 0; + int result = 0; - expected = 10; - result = MAX(expected, 9); - TEST_INT(&result, &expected); + expected = 10; + result = MAX(expected, 9); + TEST_INT(&result, &expected); - expected = -15; - result = MAX(expected, -16); - TEST_INT(&result, &expected); + expected = -15; + result = MAX(expected, -16); + TEST_INT(&result, &expected); - expected = 0; - result = MAX(expected, -1); - TEST_INT(&result, &expected); + expected = 0; + result = MAX(expected, -1); + TEST_INT(&result, &expected); - expected = 1; - result = MAX(expected, 0); - TEST_INT(&result, &expected); + expected = 1; + result = MAX(expected, 0); + TEST_INT(&result, &expected); }) TFUNCTION(test_min, { - int expected = 0; - int result = 0; + int expected = 0; + int result = 0; - expected = 9; - result = MIN(expected, 10); - TEST_INT(&result, &expected); + expected = 9; + result = MIN(expected, 10); + TEST_INT(&result, &expected); - expected = -16; - result = MIN(expected, -15); - TEST_INT(&result, &expected); + expected = -16; + result = MIN(expected, -15); + TEST_INT(&result, &expected); - expected = -1; - result = MIN(expected, 0); - TEST_INT(&result, &expected); + expected = -1; + result = MIN(expected, 0); + TEST_INT(&result, &expected); - expected = 0; - result = MIN(expected, 1); - TEST_INT(&result, &expected); + expected = 0; + result = MIN(expected, 1); + TEST_INT(&result, &expected); }) TFILE_ENTRY_POINT(test_util, {