Changeset 102

Timestamp:

08/30/11 18:51:01 (21 months ago)

Author:

pouillon

Message:

Fixed design flaws in error handlers

Location:

trunk/src

Files:

• pspio_error.c (modified) (3 diffs)
• pspio_error.h (modified) (4 diffs)

trunk/src/pspio_error.c

@@ -24 +24 @@
 
 
-int pspio_error_add(const int id, const char *filename, const long line) {
+int pspio_error_add(const char *filename, const long line) {
   int s;
   pspio_error_t *last_err;
@@ -34 +34 @@
     }
 
-    pspio_error_chain->id = id;
+    pspio_error_chain->id = pspio_error_tmp_id;
     pspio_error_chain->line = line;
     pspio_error_chain->next = NULL;
@@ -58 +58 @@
   }
   last_err = last_err->next;
-  last_err->id = id;
+  last_err->id = pspio_error_tmp_id;
   last_err->line = line;
   last_err->next = NULL;

trunk/src/pspio_error.h

@@ -26 +26 @@
  * @brief Error codes and handlers
  */
+
+#include <stdlib.h>
 
 #if defined HAVE_CONFIG_H
@@ -61 +63 @@
 } pspio_error_t;
 
-static pspio_error_t *pspio_error_chain;
+/* The following is a VERY bad trick. Whoever finds better is welcome to
+ * speak. */
+static int pspio_error_tmp_id = 0;
+static pspio_error_t *pspio_error_chain = NULL;
 
 
@@ -68 +73 @@
  * @param[in] new_error: new error to add
  */
-int pspio_error_add(const int id, const char *filename, const long line);
+int pspio_error_add(const char *filename, const long line);
 
 
@@ -84 +89 @@
  */
 #define HANDLE_ERROR(FUNCTION_CALL, TYPE_TO_FREE, VAR_TO_FREE) \
-  int ierr_macro; \
-  ierr_macro = FUNCTION_CALL; \
-  if ( ierr_macro != PSPIO_SUCCESS ) { \
+  pspio_error_tmp_id = FUNCTION_CALL; \
+  if ( pspio_error_tmp_id != PSPIO_SUCCESS ) { \
     pspio_ ## TYPE_TO_FREE ## _free(VAR_TO_FREE); \
-    pspio_error_add(ierr_macro, __FILE__, __LINE__); \
-    return ierr_macro; \
+    pspio_error_add(pspio_error_tmp_id, __FILE__, __LINE__); \
+    return pspio_error_tmp_id; \
   }
 #endif
+
+