Skip to content

Removed output buffers from struct definitions #222

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

Open
Aaron0372 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Removed output buffers from struct definitions #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions src/modelconfig/configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ int configuration_load (const char *filepath,
char *error = NULL;
int rc = 0;
char *tmp_path = NULL;

int len;

rc = MPI_File_open(comm, (char*)filepath, MPI_MODE_RDONLY, MPI_INFO_NULL, &fh);
if (rc != MPI_SUCCESS) goto finalize;

Expand All @@ -54,10 +55,14 @@ int configuration_load (const char *filepath,
#else
f = fmemopen(txtdata, txtsize, "rb");
#endif
if (!f) { rc = 1; goto finalize; }
if (!f) {
rc = -1;
error = strdup("Could not access data in \'rb\' mode");
goto finalize;
}

*handle = txtfile_openStream(f, &error);
if (error) { rc = 1; goto finalize; }
if (error) { rc = -1; goto finalize; }

/* NOTE: posix version overwrites argument :(. */
tmp_path = strdup(filepath);
Expand All @@ -72,11 +77,17 @@ int configuration_load (const char *filepath,
if (f) fclose(f);
free(txtdata);
free(tmp_path);

if (rc != MPI_SUCCESS && !error) {
error = (char*) malloc(MPI_MAX_ERROR_STRING);
MPI_Error_string(rc, error, &len);
}

if (error) {
fprintf(stderr, "config error: %s\n", error);
free(error);
exit(EXIT_FAILURE);
}

return rc;
}

Expand Down