diff --git a/logger/logger_dump.h b/logger/logger_dump.h index ab66c05daaa37a6b6effffa307ad98c5257ca44d..cad0a0e51529be2bdc20dfc640295f7954387c32 100644 --- a/logger/logger_dump.h +++ b/logger/logger_dump.h @@ -29,10 +29,12 @@ struct logger_reader; /** * @brief This structure deals with the dump file. + * + * TODO */ struct logger_dump { - /* Information contained in the header. */ + /* Information contained in the file header. */ struct header header; /* The reader that is using this dump. */ @@ -41,9 +43,6 @@ struct logger_dump { /* Information about the time chunks */ struct time_array times; - /* Dump's filename */ - char *filename; - /* The dump's variables. */ struct { /* Mapped data */ diff --git a/logger/logger_header.c b/logger/logger_header.c index d78fbe08934efa0dc57651ffdb2f00b4e7e071be..1a93076f5edc2605b6413fec9e0ab094c9d3f2d9 100644 --- a/logger/logger_header.c +++ b/logger/logger_header.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -/* Task type names. */ +/* Offset type names. */ const char *logger_offset_name[logger_offset_count] = { "Forward", "Backward", "Corrupted", }; diff --git a/logger/logger_io.c b/logger/logger_io.c index 9b82d273828b73eeed839e9a9b29511f158edecc..0995c0fbd7f063c92751092839c1448c7696a7b1 100644 --- a/logger/logger_io.c +++ b/logger/logger_io.c @@ -29,14 +29,14 @@ * @brief get the size of a file * * @param fd file id - * @param size out: file size * + * @return file size */ -void io_get_file_size(int fd, size_t *size) { +size_t io_get_file_size(int fd) { struct stat s; int status = fstat(fd, &s); if (status != 0) error("Unable to get file size (%s)", strerror(errno)); - *size = s.st_size; + return s.st_size; } /** @@ -55,8 +55,7 @@ void *io_mmap_file(char *filename, size_t *file_size) { error("Unable to open file %s (%s)", filename, strerror(errno)); /* get file size */ - *file_size = 0; - io_get_file_size(fd, file_size); + *file_size = io_get_file_size(fd); /* map memory */ void *map = mmap(NULL, *file_size, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0); diff --git a/logger/logger_io.h b/logger/logger_io.h index e1f69c7f1ccc85791f093b710133a403c23ec5ba..7fafab84fe34c8aa54464e4f51007939109a208c 100644 --- a/logger/logger_io.h +++ b/logger/logger_io.h @@ -28,7 +28,7 @@ #include <stdio.h> #include <stdlib.h> -void io_get_file_size(int fd, size_t *size); +size_t io_get_file_size(int fd); void *io_mmap_file(char *filename, size_t *file_size); void io_munmap_file(void *map, size_t file_size); diff --git a/logger/logger_python_wrapper.c b/logger/logger_python_wrapper.c index d390511755e743e88aa34d9a853eab129e89b082..4c8c2d0b04a00f1f3a9f15af397ecd3fb84c159b 100644 --- a/logger/logger_python_wrapper.c +++ b/logger/logger_python_wrapper.c @@ -75,7 +75,6 @@ static PyObject *loadFromIndex(__attribute__((unused)) PyObject *self, } /* initialize the reader */ - verbose = 2; struct logger_reader reader; logger_reader_init(&reader, filename, verbose); struct header *h = &reader.dump.header;