--- a/src/error.h	Sun Feb 22 06:44:16 2009 +0200
+++ b/src/error.h	Sun Feb 22 06:52:55 2009 +0200
@@ -16,19 +16,24 @@
  * List of defined error codes, organized mostly by function name
  */
 enum error_code {
+    /* Core functions */
     ERR_CALLOC                  = 0x000100,
     
-    // network resolver errors
+    /* Network resolver errors */
     ERR_GETADDRINFO             = 0x000200,
     ERR_GETADDRINFO_EMPTY       = 0x000201,     /* No valid results */
 
-    // low-level network errors
+    /* Low-level network errors */
     ERR_SOCKET                  = 0x000301,
     ERR_CONNECT                 = 0x000302,
 
-    // low-level IO errors
+    /* Low-level IO errors */
     ERR_READ                    = 0x000401,
     ERR_WRITE                   = 0x000402,
+
+    /* GnuTLS errors */
+    ERR_GNUTLS_CERT_ALLOC_CRED  = 0x010101,
+    ERR_GNUTLS_GLOBAL_INIT      = 0x010102,
 };
 
 /*
@@ -46,31 +51,31 @@
 #define SUCCESS (0)
 
 /* Evaulates to error_info.code as lvalue */
-#define ERROR_CODE(err_info) ((err_info).code)
+#define ERROR_CODE(err_info_ptr) ((err_info_ptr)->code)
 
 /* Evaulates to error_info.extra as lvalue */
-#define ERROR_EXTRA(err_info) ((err_info).extra)
+#define ERROR_EXTRA(err_info_ptr) ((err_info_ptr)->extra)
 
 /* Set error_info.code to SUCCESS, evaulates as zero */
-#define RESET_ERROR(err_info) ((err_info).code = SUCCESS)
+#define RESET_ERROR(err_info_ptr) ((err_info_ptr)->code = SUCCESS)
 
 /* Compare error_info.code != 0 */
-#define IS_ERROR(err_info) (!!(err_info).code)
+#define IS_ERROR(err_info_ptr) (!!(err_info_ptr)->code)
 
 /* Set error_info.code, but leave err_extra as-is. Evaluates to err_code */
-#define SET_ERROR(err_info, err_code) ((err_info).code = (err_code))
+#define SET_ERROR(err_info_ptr, err_code) ((err_info_ptr)->code = (err_code))
 
 /* Set error_info.code/extra. XXX: should evaluate to err_code */
-#define _SET_ERROR_EXTRA(err_info, err_code, err_extra) (err_info).code = (err_code); err_info.extra = (err_extra)
-#define SET_ERROR_EXTRA(err_info, err_code, err_extra) do { _SET_ERROR_EXTRA(err_info, err_code, err_extra); } while (0)
+#define _SET_ERROR_EXTRA(err_info_ptr, err_code, err_extra) (err_info_ptr)->code = (err_code); (err_info_ptr)->extra = (err_extra)
+#define SET_ERROR_EXTRA(err_info_ptr, err_code, err_extra) do { _SET_ERROR_EXTRA(err_info_ptr, err_code, err_extra); } while (0)
 
 /* Set error.info.code to err_code, and .extra to errno. XXX: should evaulate to err_code */
-#define _SET_ERROR_ERRNO(err_info, err_code) _SET_ERROR_EXTRA(err_info, err_code, errno);
-#define SET_ERROR_ERRNO(err_info, err_code) SET_ERROR_EXTRA(err_info, err_code, errno);
+#define _SET_ERROR_ERRNO(err_info_ptr, err_code) _SET_ERROR_EXTRA(err_info_ptr, err_code, errno);
+#define SET_ERROR_ERRNO(err_info_ptr, err_code) SET_ERROR_EXTRA(err_info_ptr, err_code, errno);
 
 /* Ss above, but also return err_code from func. XXX: use 'return SET_ERROR...' instead */
-#define RETURN_SET_ERROR(err_info, err_code) do { _SET_ERROR(err_info, err_code); return (err_code); } while (0)
-#define RETURN_SET_ERROR_EXTRA(err_info, err_code, err_extra) do { _SET_ERROR_EXTRA(err_info, err_code, err_extra); return (err_code); } while (0)
-#define RETURN_SET_ERROR_ERRNO(err_info, err_code) do { _SET_ERROR_ERRNO(err_info, err_code); return (err_code); } while (0)
+#define RETURN_SET_ERROR(err_info_ptr, err_code) do { _SET_ERROR(err_info_ptr, err_code); return (err_code); } while (0)
+#define RETURN_SET_ERROR_EXTRA(err_info_ptr, err_code, err_extra) do { _SET_ERROR_EXTRA(err_info_ptr, err_code, err_extra); return (err_code); } while (0)
+#define RETURN_SET_ERROR_ERRNO(err_info_ptr, err_code) do { _SET_ERROR_ERRNO(err_info_ptr, err_code); return (err_code); } while (0)
 
 #endif