1 files changed, 14 insertions, 9 deletions

diff --git a/libical/src/libical/icalerror.h b/libical/src/libical/icalerror.h
index 52f5ba9..826c8e8 100644
--- a/libical/src/libical/icalerror.h
+++ b/libical/src/libical/icalerror.h
@@ -35,51 +35,55 @@
 #include "config.h"
 #endif
 
 #define ICAL_SETERROR_ISFUNC
 
 
-/* This routine is called before any error is triggered. It is called
+/** This routine is called before any error is triggered. It is called
    by icalerror_set_errno, so it does not appear in all of the macros
    below */
 void icalerror_stop_here(void);
 
 void icalerror_crash_here(void);
 
 typedef enum icalerrorenum {
-    
+    ICAL_NO_ERROR,     /* icalerrno may not be initialized - put it first so and pray that the compiler initialize things to zero */    
     ICAL_BADARG_ERROR,
     ICAL_NEWFAILED_ERROR,
     ICAL_ALLOCATION_ERROR,
     ICAL_MALFORMEDDATA_ERROR, 
     ICAL_PARSE_ERROR,
     ICAL_INTERNAL_ERROR, /* Like assert --internal consist. prob */
     ICAL_FILE_ERROR,
     ICAL_USAGE_ERROR,
     ICAL_UNIMPLEMENTED_ERROR,
-    ICAL_UNKNOWN_ERROR, /* Used for problems in input to icalerror_strerror()*/
-    ICAL_NO_ERROR
+    ICAL_UNKNOWN_ERROR  /* Used for problems in input to icalerror_strerror()*/
 
 } icalerrorenum;
 
-/* The libical error enumeration, like errno*/
-extern icalerrorenum icalerrno;
+icalerrorenum * icalerrno_return(void);
+#define icalerrno (*(icalerrno_return()))
 
-/* If true, libicl aborts after a call to icalerror_set_error*/
+/** If true, libicl aborts after a call to icalerror_set_error
+ *
+ *  @warning NOT THREAD SAFE -- recommended that you do not change
+ *           this in a multithreaded program.
+ */
 extern int icalerror_errors_are_fatal;
 
 /* Warning messages */
 
 #ifdef __GNUC__ca
 #define icalerror_warn(message) {fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);}
 #else /* __GNU_C__ */
 #define icalerror_warn(message) {fprintf(stderr,"%s:%d: %s\n",__FILE__,__LINE__,message);}
 #endif /* __GNU_C__ */
 
 
 void icalerror_clear_errno(void);
+void _icalerror_set_errno(icalerrorenum);
 
 /* Make an individual error fatal or non-fatal. */
 typedef enum icalerrorstate { 
     ICAL_ERROR_FATAL,     /* Not fata */
     ICAL_ERROR_NONFATAL,  /* Fatal */
     ICAL_ERROR_DEFAULT,   /* Use the value of icalerror_errors_are_fatal*/
@@ -91,20 +95,21 @@ char* icalerror_perror();
 void icalerror_set_error_state( icalerrorenum error, icalerrorstate);
 icalerrorstate icalerror_get_error_state( icalerrorenum error);
 
 #ifndef ICAL_SETERROR_ISFUNC
 #define icalerror_set_errno(x) \
 icalerrno = x; \
+    fprintf(stderr,"Ical error # %d\n", x); \
 if(icalerror_get_error_state(x)==ICAL_ERROR_FATAL || \
    (icalerror_get_error_state(x)==ICAL_ERROR_DEFAULT && \
     icalerror_errors_are_fatal == 1 )){ \
    icalerror_warn(icalerror_strerror(x)); \
    assert(0); \
-}
+} 
 #else
-void icalerror_set_errno(icalerrorenum);
+void icalerror_set_errno(icalerrorenum x); 
 #endif
 
 #ifdef ICAL_ERRORS_ARE_FATAL
 #undef NDEBUG
 #endif