Skip to content

Adds missing failure exit codes for compile sample program #2831

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

Adds missing failure exit codes for compile sample program #2831

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
16 changes: 8 additions & 8 deletions sample/compile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ mjtNum gettm(void) {
}

// deallocate and print message
int finish(const char* msg = 0, mjModel* m = 0) {
int finish(const char* msg = 0, int exitcode = EXIT_SUCCESS, mjModel* m = 0) {
// deallocated everything
if (m) {
mj_deleteModel(m);
Expand All @@ -50,7 +50,7 @@ int finish(const char* msg = 0, mjModel* m = 0) {
std::cout << msg << std::endl;
}

return EXIT_SUCCESS;
return exitcode;
}


Expand Down Expand Up @@ -109,7 +109,7 @@ int main(int argc, char** argv) {

// print help if arguments are missing
if (argc!=3 && argc!=2) {
return finish(helpstring);
return finish(helpstring, EXIT_FAILURE);
}

// determine file types
Expand All @@ -119,7 +119,7 @@ int main(int argc, char** argv) {
// check types
if (type1==typeUNKNOWN || type1==typeTXT ||
type2==typeUNKNOWN || (type1==typeMJB && type2==typeXML)) {
return finish("Illegal combination of file formats");
return finish("Illegal combination of file formats", EXIT_FAILURE);
}

// check if output file exists
Expand Down Expand Up @@ -153,16 +153,16 @@ int main(int argc, char** argv) {
// check error
if (!m) {
if (type1==typeXML) {
return finish(error, 0);
return finish(error, EXIT_FAILURE);
} else {
return finish("Could not load model", 0);
return finish("Could not load model", EXIT_FAILURE);
}
}

// save model
if (type2==typeXML) {
if (!mj_saveLastXML(argv[2], m, error, 1000)) {
return finish(error, m);
return finish(error, EXIT_FAILURE, m);
}
} else if (type2==typeMJB) {
mj_saveModel(m, argv[2], 0, 0);
Expand All @@ -181,5 +181,5 @@ int main(int argc, char** argv) {
snprintf(msg, sizeof(msg), "Done.");
}

return finish(msg, m);
return finish(msg, EXIT_SUCCESS, m);
}