-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 @@ | |||
1 | #include <GL/glut.h> | 1 | #include <GL/glut.h> |
2 | #include <error.h> | 2 | #include <error.h> |
3 | #include <errno.h> | 3 | #include <errno.h> |
4 | #include <stdlib.h> | ||
4 | #include "sqlinfoprint.h" | 5 | #include "sqlinfoprint.h" |
5 | extern struct sqlca sqlca; | 6 | extern struct sqlca sqlca; |
6 | 7 | ||
@@ -15,14 +16,15 @@ check_error (const char *filename, const unsigned int linenum) | |||
15 | if (errCode != GL_NO_ERROR) | 16 | if (errCode != GL_NO_ERROR) |
16 | { | 17 | { |
17 | const GLubyte *errString = gluErrorString (errCode); | 18 | const GLubyte *errString = gluErrorString (errCode); |
18 | error_at_line (-1, errno, filename, linenum, | 19 | error_at_line (EXIT_FAILURE, errno, filename, linenum, |
19 | "OpenGL Error %s", errString); | 20 | "OpenGL Error %s", errString); |
20 | } | 21 | } |
21 | 22 | ||
22 | /* | 23 | /* |
23 | * Check for an error from the Database API. | 24 | * Check for an error from the Database API. |
24 | */ | 25 | */ |
25 | sqlinfoprint ("DB Error", &sqlca, filename, linenum); | 26 | if (sqlinfoprint ("DB Error", &sqlca, filename, linenum) == 1) |
27 | exit (EXIT_FAILURE); | ||
26 | 28 | ||
27 | return; | 29 | return; |
28 | } | 30 | } |