Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
707d6f8b
Commit
707d6f8b
authored
Dec 15, 2017
by
lhausamm
Committed by
Loic Hausammann
Oct 31, 2018
Browse files
Fix memory errors
parent
67b00121
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/logger.c
View file @
707d6f8b
...
...
@@ -40,11 +40,11 @@
#include
"units.h"
#include
"engine.h"
char
LOGGER_VERSION
[
LOGGER_VERSION_SIZE
]
=
"0.1"
;
void
logger_write_data
(
struct
dump
*
d
,
size_t
*
offset
,
size_t
size
,
void
*
p
)
void
logger_write_data
(
struct
dump
*
d
,
size_t
*
offset
,
const
size_t
size
,
void
*
const
p
)
{
char
*
buff
;
buff
=
dump_get
(
d
,
size
,
offset
);
char
*
buff
=
dump_get
(
d
,
size
,
offset
);
memcpy
(
buff
,
p
,
size
);
}
...
...
@@ -337,7 +337,7 @@ void logger_write_file_header(struct dump *dump, struct engine *e) {
if
(
file_offset
!=
0
)
error
(
"Something was already written in the dump file"
);
/* Write version information */
logger_write_data
(
dump
,
&
file_offset
,
LOGGER_VERSION_SIZE
,
LOGGER_VERSION
);
logger_write_data
(
dump
,
&
file_offset
,
LOGGER_VERSION_SIZE
,
&
LOGGER_VERSION
);
/* write number of bytes used for the offsets */
logger_write_data
(
dump
,
&
file_offset
,
LOGGER_OFFSET_SIZE
,
&
log_const
.
offset
);
...
...
@@ -378,12 +378,16 @@ void logger_write_file_header(struct dump *dump, struct engine *e) {
/* write data name (mass, id, ...) */
/* Write data */
char
*
name
=
malloc
(
sizeof
(
char
)
*
log_const
.
name
);
strcpy
(
name
,
"timeBase"
);
logger_write_general_data
(
dump
,
&
log_const
,
&
file_offset
,
&
e
->
timeBase
,
"timeBase"
,
logger_data_double
);
name
,
logger_data_double
);
/* last step */
memcpy
(
skip_header
,
&
file_offset
,
log_const
.
offset
);
logger_const_free
(
&
log_const
);
free
(
name
);
}
void
logger_const_init
(
struct
logger_const
*
log_const
)
{
...
...
src/logger.h
View file @
707d6f8b
...
...
@@ -84,12 +84,14 @@ struct dump;
* Size in bytes
*/
#define LOGGER_VERSION_SIZE 20 // size of the version message
#define LOGGER_NAME_SIZE 2 // size of the labels
#define LOGGER_MASK_SIZE 1 // size of the masks
#define LOGGER_NBER_SIZE 1 // size of the number of elements
#define LOGGER_NAME_SIZE 2 // size of the labels
size
#define LOGGER_MASK_SIZE 1 // size of the masks
size
#define LOGGER_NBER_SIZE 1 // size of the number of elements
size
#define LOGGER_OFFSET_SIZE 1// size of the offset size information
#define LOGGER_DATATYPE_SIZE 1
extern
char
LOGGER_VERSION
[
LOGGER_VERSION_SIZE
];
struct
logger_const
{
size_t
name
;
// labels size
size_t
offset
;
// offset size
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment