| -rw-r--r-- | r/connect.R | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/controller/exp004reshape.c | 11 | ||||
| -rw-r--r-- | src/model/density_legend_geometry.c | 81 | ||||
| -rw-r--r-- | src/model/density_legend_geometry.h | 9 | ||||
| -rw-r--r-- | src/model/display_list_index.h | 6 | ||||
| -rw-r--r-- | src/model/exp004state.h | 14 | ||||
| -rw-r--r-- | src/util/check_error.c | 6 | ||||
| -rw-r--r-- | src/view/exp004geometry.c | 7 | ||||
| -rw-r--r-- | src/view/exp004init.c | 8 | ||||
| -rw-r--r-- | src/view/exp004view.c | 4 |
11 files changed, 124 insertions, 27 deletions
diff --git a/src/util/check_error.c b/src/util/check_error.c index cd00439..c47ca43 100644 --- a/src/util/check_error.c +++ b/src/util/check_error.c @@ -1,6 +1,7 @@ #include <GL/glut.h> #include <error.h> #include <errno.h> +#include <stdlib.h> #include "sqlinfoprint.h" extern struct sqlca sqlca; @@ -15,14 +16,15 @@ check_error (const char *filename, const unsigned int linenum) if (errCode != GL_NO_ERROR) { const GLubyte *errString = gluErrorString (errCode); - error_at_line (-1, errno, filename, linenum, + error_at_line (EXIT_FAILURE, errno, filename, linenum, "OpenGL Error %s", errString); } /* * Check for an error from the Database API. */ - sqlinfoprint ("DB Error", &sqlca, filename, linenum); + if (sqlinfoprint ("DB Error", &sqlca, filename, linenum) == 1) + exit (EXIT_FAILURE); return; } |
