Changeset 1757 for trunk

Timestamp:

15/11/11 12:44:33 (6 months ago)

Author:

Freddie Akeroyd

Message:

Tidy up error handling to see if that helps. Refs #303

File:

• trunk/src/napi.c (modified) (5 diffs)

trunk/src/napi.c

@@ -289 +289 @@
   /*---------------------------------------------------------------------*/
 
-  void *NXpData = NULL;
-  void *NXEHpData = NULL;
-  void (*NXEHIReportError)(void *pData, char *string) = NXNXNXReportError;
+  static void *NXEHpData = NULL;
+  static void (*NXEHIReportError)(void *pData, char *string) = NXNXNXReportError;
 #ifdef HAVE_TLS
-  __thread void *NXEHpTData = NULL;
-  __thread void (*NXEHIReportTError)(void *pData, char *string) = NULL;
+  static __thread void *NXEHpTData = NULL;
+  static __thread void (*NXEHIReportTError)(void *pData, char *string) = NULL;
 #endif
 
   void NXIReportError(void *pData, char *string) {
-        fprintf(stderr, "Your application uses NXIReportError, but its first parameter is ignored now.");
+        fprintf(stderr, "Your application uses NXIReportError, but its first parameter is ignored now - you should use NXReportError.");
         NXReportError(string);
   }
@@ -309 +308 @@
         } 
 #endif
-
-        (*NXEHIReportError)(NXEHpData, string);
+        if (NXEHIReportError) {
+            (*NXEHIReportError)(NXEHpData, string);
+        }
   }
 
@@ -340 +340 @@
 
 /*----------------------------------------------------------------------*/
-void NXNXNoReport(void *pData, char *string){
+static void NXNXNoReport(void *pData, char *string){
   /* do nothing */
 }  
 /*----------------------------------------------------------------------*/
 
-ErrFunc last_global_errfunc = NXNXNXReportError;
+static ErrFunc last_global_errfunc = NXNXNXReportError;
 #ifdef HAVE_TLS
-__thread ErrFunc last_thread_errfunc = NULL;
+static __thread ErrFunc last_thread_errfunc = NULL;
 #endif
 
@@ -356 +356 @@
                 last_thread_errfunc = NXEHIReportTError;
                 NXEHIReportTError = NXNXNoReport;
-                return;
+                return;
         } 
-        last_thread_errfunc = NULL;
 #endif
-        last_global_errfunc = NXEHIReportError;
-        NXEHIReportError = NXNXNoReport;
+        if (NXEHIReportError) {
+            last_global_errfunc = NXEHIReportError;
+            NXEHIReportError = NXNXNoReport;
+        }
 }
 
@@ -370 +371 @@
                 NXEHIReportTError = last_thread_errfunc;
                 last_thread_errfunc = NULL;
-                return;
+                return;
         } 
 #endif
-        NXEHIReportError = last_global_errfunc;
+        if (last_global_errfunc) {
+            NXEHIReportError = last_global_errfunc;
+            last_global_errfunc = NULL;
+        }
 }