Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix overread warnings #156

Merged
merged 2 commits into from
Sep 30, 2022
Merged

Fix overread warnings #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8cb274
Silence stringop overread warning
tim-griesbach Sep 29, 2022
ec5a5f0
Use always char ptr. for strings for consistent func. param.
tim-griesbach Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/p4est_extended.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,9 +602,7 @@ p4est_t *p4est_source_ext (sc_io_source_t * src,
*/
p4est_file_context_t *p4est_file_open_read_ext (sc_MPI_Comm mpicomm,
const char *filename,
char
user_string
[P4EST_FILE_USER_STRING_BYTES],
char *user_string,
p4est_gloidx_t *
global_num_quadrants,
int *errcode);
Expand All @@ -620,9 +618,7 @@ p4est_file_context_t *p4est_file_open_read_ext (sc_MPI_Comm mpicomm,
p4est_file_context_t *p4est_file_read_field_ext (p4est_file_context_t * fc,
p4est_gloidx_t * gfq,
sc_array_t * quadrant_data,
char
user_string
[P4EST_FILE_USER_STRING_BYTES],
char *user_string,
int *errcode);

/** Create the data necessary to create a PETsc DMPLEX representation of a
Expand Down
33 changes: 11 additions & 22 deletions src/p4est_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,7 @@ static int p4est_file_error_code (int errcode, int *p4est_errcode);

p4est_file_context_t *
p4est_file_open_create (p4est_t * p4est, const char *filename,
const char user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
const char *user_string, int *errcode)
{
int mpiret, count, count_error, mpisize;
/* We enforce the padding of the file header. */
Expand Down Expand Up @@ -677,7 +676,7 @@ p4est_file_open_create (p4est_t * p4est, const char *filename,

p4est_file_context_t *
p4est_file_open_read_ext (sc_MPI_Comm mpicomm, const char *filename,
char user_string[P4EST_FILE_USER_STRING_BYTES],
char *user_string,
p4est_gloidx_t * global_num_quadrants, int *errcode)
{
int mpiret, rank;
Expand Down Expand Up @@ -750,8 +749,7 @@ p4est_file_open_read_ext (sc_MPI_Comm mpicomm, const char *filename,

p4est_file_context_t *
p4est_file_open_read (p4est_t * p4est, const char *filename,
char user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
char *user_string, int *errcode)
{
p4est_gloidx_t global_num_quadrants;
p4est_file_context_t *fc;
Expand Down Expand Up @@ -795,8 +793,7 @@ p4est_file_open_read (p4est_t * p4est, const char *filename,
p4est_file_context_t *
p4est_file_write_header (p4est_file_context_t * fc, size_t header_size,
const void *header_data,
const char user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
const char *user_string, int *errcode)
{
size_t num_pad_bytes;
char header_metadata[P4EST_FILE_FIELD_HEADER_BYTES + 1],
Expand Down Expand Up @@ -915,9 +912,7 @@ static p4est_file_context_t *
p4est_file_read_block_metadata (p4est_file_context_t * fc,
size_t * read_data_size, size_t data_size,
char block_type,
char
user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
char *user_string, int *errcode)
{
int mpiret, count, count_error, rank;
int bytes_to_read;
Expand Down Expand Up @@ -1073,8 +1068,7 @@ p4est_file_read_block_metadata (p4est_file_context_t * fc,
p4est_file_context_t *
p4est_file_read_header (p4est_file_context_t * fc,
size_t header_size, void *header_data,
char user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
char *user_string, int *errcode)
{
int mpiret, count, count_error, rank;
size_t num_pad_bytes, read_data_size;
Expand Down Expand Up @@ -1167,8 +1161,7 @@ p4est_file_read_header (p4est_file_context_t * fc,

p4est_file_context_t *
p4est_file_write_field (p4est_file_context_t * fc, sc_array_t * quadrant_data,
const char user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
const char *user_string, int *errcode)
{
size_t bytes_to_write, num_pad_bytes, array_size;
char array_metadata[P4EST_FILE_FIELD_HEADER_BYTES + 1],
Expand Down Expand Up @@ -1301,8 +1294,7 @@ p4est_file_write_field (p4est_file_context_t * fc, sc_array_t * quadrant_data,
p4est_file_context_t *
p4est_file_read_field_ext (p4est_file_context_t * fc, p4est_gloidx_t * gfq,
sc_array_t * quadrant_data,
char user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
char *user_string, int *errcode)
{
int count;
size_t bytes_to_read, num_pad_bytes, array_size,
Expand Down Expand Up @@ -1411,8 +1403,7 @@ p4est_file_read_field_ext (p4est_file_context_t * fc, p4est_gloidx_t * gfq,

p4est_file_context_t *
p4est_file_read_field (p4est_file_context_t * fc, sc_array_t * quadrant_data,
char user_string[P4EST_FILE_USER_STRING_BYTES],
int *errcode)
char *user_string, int *errcode)
{
int mpiret, mpisize, rank;
p4est_gloidx_t *gfq = NULL;
Expand Down Expand Up @@ -1465,8 +1456,7 @@ p4est_file_read_field (p4est_file_context_t * fc, sc_array_t * quadrant_data,

int
p4est_file_info (p4est_t * p4est, const char *filename,
char user_string[P4EST_FILE_USER_STRING_BYTES],
sc_array_t * data_sections, int *errcode)
char *user_string, sc_array_t * data_sections, int *errcode)
{
int mpiret, eclass;
int retval;
Expand Down Expand Up @@ -1784,8 +1774,7 @@ p4est_file_error_code (int errcode, int *p4est_errcode)
}

int
p4est_file_error_string (int errclass, char string[sc_MPI_MAX_ERROR_STRING],
int *resultlen)
p4est_file_error_string (int errclass, char *string, int *resultlen)
{
int retval;
const char *tstr = NULL;
Expand Down
32 changes: 8 additions & 24 deletions src/p4est_io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ p4est_file_error_t;
*/
p4est_file_context_t *p4est_file_open_create
(p4est_t * p4est, const char *filename,
const char user_string[P4EST_FILE_USER_STRING_BYTES], int *errcode);
const char *user_string, int *errcode);

/** Open a file for reading and read its user string on rank zero.
* The user string is broadcasted to all ranks after reading.
Expand Down Expand Up @@ -250,10 +250,7 @@ p4est_file_context_t *p4est_file_open_create
*/
p4est_file_context_t *p4est_file_open_read (p4est_t * p4est,
const char *filename,
char
user_string
[P4EST_FILE_USER_STRING_BYTES],
int *errcode);
char *user_string, int *errcode);

/** Write a header block to an opened file.
* This function requires an opened file context.
Expand Down Expand Up @@ -290,9 +287,7 @@ p4est_file_context_t *p4est_file_open_read (p4est_t * p4est,
p4est_file_context_t *p4est_file_write_header (p4est_file_context_t * fc,
size_t header_size,
const void *header_data,
const char
user_string
[P4EST_FILE_USER_STRING_BYTES],
const char *user_string,
int *errcode);

/** Read a header block from an opened file.
Expand Down Expand Up @@ -338,9 +333,7 @@ p4est_file_context_t *p4est_file_write_header (p4est_file_context_t * fc,
p4est_file_context_t *p4est_file_read_header (p4est_file_context_t * fc,
size_t header_size,
void *header_data,
char
user_string
[P4EST_FILE_USER_STRING_BYTES],
char *user_string,
int *errcode);

/** Write one (more) per-quadrant data set to a parallel output file.
Expand Down Expand Up @@ -386,9 +379,7 @@ p4est_file_context_t *p4est_file_read_header (p4est_file_context_t * fc,
*/
p4est_file_context_t *p4est_file_write_field (p4est_file_context_t * fc,
sc_array_t * quadrant_data,
const char
user_string
[P4EST_FILE_USER_STRING_BYTES],
const char *user_string,
int *errcode);

/** Read one (more) per-quadrant data set from a parallel input file.
Expand Down Expand Up @@ -441,10 +432,7 @@ p4est_file_context_t *p4est_file_write_field (p4est_file_context_t * fc,
*/
p4est_file_context_t *p4est_file_read_field (p4est_file_context_t * fc,
sc_array_t * quadrant_data,
char
user_string
[P4EST_FILE_USER_STRING_BYTES],
int *errcode);
char *user_string, int *errcode);

/** A data type that encodes the metadata of one data block in a p4est data file.
*/
Expand Down Expand Up @@ -499,9 +487,7 @@ p4est_file_section_metadata_t;
* an error. See also errcode argument.
*/
int p4est_file_info (p4est_t * p4est, const char *filename,
char
user_string
[P4EST_FILE_USER_STRING_BYTES],
char *user_string,
sc_array_t * data_sections,
int *errcode);

Expand All @@ -515,9 +501,7 @@ int p4est_file_info (p4est_t * p4est, const char *filename,
* something else on invalid arguments.
*/
int p4est_file_error_string (int errclass,
char
string[sc_MPI_MAX_ERROR_STRING],
int *resultlen);
char *string, int *resultlen);

/** Close a file opened for parallel write/read and free the context.
* \param [in,out] fc Context previously created by \ref
Expand Down
8 changes: 2 additions & 6 deletions src/p8est_extended.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,9 +608,7 @@ p8est_t *p8est_source_ext (sc_io_source_t * src,
*/
p8est_file_context_t *p8est_file_open_read_ext (sc_MPI_Comm mpicomm,
const char *filename,
char
user_string
[P8EST_FILE_USER_STRING_BYTES],
char *user_string,
p4est_gloidx_t *
global_num_quadrants,
int *errcode);
Expand All @@ -626,9 +624,7 @@ p8est_file_context_t *p8est_file_open_read_ext (sc_MPI_Comm mpicomm,
p8est_file_context_t *p8est_file_read_field_ext (p8est_file_context_t * fc,
p4est_gloidx_t * gfq,
sc_array_t * quadrant_data,
char
user_string
[P8EST_FILE_USER_STRING_BYTES],
char *user_string,
int *errcode);

/** Create the data necessary to create a PETsc DMPLEX representation of a
Expand Down
32 changes: 8 additions & 24 deletions src/p8est_io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ p8est_file_error_t;
*/
p8est_file_context_t *p8est_file_open_create
(p8est_t * p8est, const char *filename,
const char user_string[P8EST_FILE_USER_STRING_BYTES], int *errcode);
const char *user_string, int *errcode);

/** Open a file for reading and read its user string on rank zero.
* The user string is broadcasted to all ranks after reading.
Expand Down Expand Up @@ -250,10 +250,7 @@ p8est_file_context_t *p8est_file_open_create
*/
p8est_file_context_t *p8est_file_open_read (p8est_t * p8est,
const char *filename,
char
user_string
[P8EST_FILE_USER_STRING_BYTES],
int *errcode);
char *user_string, int *errcode);

/** Write a header block to an opened file.
* This function requires an opened file context.
Expand Down Expand Up @@ -290,9 +287,7 @@ p8est_file_context_t *p8est_file_open_read (p8est_t * p8est,
p8est_file_context_t *p8est_file_write_header (p8est_file_context_t * fc,
size_t header_size,
const void *header_data,
const char
user_string
[P8EST_FILE_USER_STRING_BYTES],
const char *user_string,
int *errcode);

/** Read a header block from an opened file.
Expand Down Expand Up @@ -338,9 +333,7 @@ p8est_file_context_t *p8est_file_write_header (p8est_file_context_t * fc,
p8est_file_context_t *p8est_file_read_header (p8est_file_context_t * fc,
size_t header_size,
void *header_data,
char
user_string
[P8EST_FILE_USER_STRING_BYTES],
char *user_string,
int *errcode);

/** Write one (more) per-quadrant data set to a parallel output file.
Expand Down Expand Up @@ -386,9 +379,7 @@ p8est_file_context_t *p8est_file_read_header (p8est_file_context_t * fc,
*/
p8est_file_context_t *p8est_file_write_field (p8est_file_context_t * fc,
sc_array_t * quadrant_data,
const char
user_string
[P8EST_FILE_USER_STRING_BYTES],
const char *user_string,
int *errcode);

/** Read one (more) per-quadrant data set from a parallel input file.
Expand Down Expand Up @@ -440,10 +431,7 @@ p8est_file_context_t *p8est_file_write_field (p8est_file_context_t * fc,
*/
p8est_file_context_t *p8est_file_read_field (p8est_file_context_t * fc,
sc_array_t * quadrant_data,
char
user_string
[P8EST_FILE_USER_STRING_BYTES],
int *errcode);
char *user_string, int *errcode);

/** A data type that encodes the metadata of one data block in a p4est data file.
*/
Expand Down Expand Up @@ -498,9 +486,7 @@ p8est_file_section_metadata_t;
* an error. See also errcode argument.
*/
int p8est_file_info (p8est_t * p8est, const char *filename,
char
user_string
[P8EST_FILE_USER_STRING_BYTES],
char *user_string,
sc_array_t * data_sections,
int *errcode);

Expand All @@ -514,9 +500,7 @@ int p8est_file_info (p8est_t * p8est, const char *filename,
* something else on invalid arguments.
*/
int p8est_file_error_string (int errclass,
char
string[sc_MPI_MAX_ERROR_STRING],
int *resultlen);
char *string, int *resultlen);

/** Close a file opened for parallel write/read and free the context.
* \param [in,out] fc Context previously created by \ref
Expand Down