# HG changeset patch
# User Tero Marttila <terom@fixme.fi>
# Date 1237232893 -7200
# Node ID 76a782abddca3c4c009d7406196575ed22f45b21
# Parent  07c14d83c698ee11060bfd2178b2574fae931b19
replace use of err_t in evsql.h with evsql_err_t, fix some warnings with EVSQL_TYPE initializer, and update .hgignore for doxygen output

diff -r 07c14d83c698 -r 76a782abddca .hgignore
--- a/.hgignore	Sun Mar 08 02:48:29 2009 +0200
+++ b/.hgignore	Mon Mar 16 21:48:13 2009 +0200
@@ -1,5 +1,5 @@
 type: re
 
 ^build
+^doc/html
 \.[^/]+.sw[op]$
-^doc/(\w+/)?html$
diff -r 07c14d83c698 -r 76a782abddca src/include/evsql.h
--- a/src/include/evsql.h	Sun Mar 08 02:48:29 2009 +0200
+++ b/src/include/evsql.h	Mon Mar 16 21:48:13 2009 +0200
@@ -39,13 +39,9 @@
 #include <event2/event.h>
 
 /**
- * XXX: err_t
+ * Type for error return codes
  */
-#ifndef LIB_ERR_H
-#define LIB_ERR_H
-#include <errno.h>
-typedef unsigned int err_t;
-#endif
+typedef unsigned int evsql_err_t;
 
 /**
  * @struct evsql
@@ -161,7 +157,7 @@
     /** Various flags */
     struct evsql_item_flags {
         /** The value may be NULL @see evsql_result_next */
-        bool null_ok : 1;
+        bool null_ok;
     } flags;
 };
 
@@ -213,7 +209,7 @@
         /**
          * The item has a value stored in `value`
          */
-        bool has_value : 1;
+        bool has_value;
     } flags;
 };
 
@@ -288,14 +284,15 @@
  * @see struct evsql_item_info
  * @see enum evsql_item_type
  */
-#define EVSQL_TYPE(typenam)                     { EVSQL_FMT_BINARY, EVSQL_TYPE_ ## typenam  }
+#define EVSQL_TYPE(typenam)                     { EVSQL_FMT_BINARY, EVSQL_TYPE_ ## typenam, { false } }
+#define EVSQL_TYPE_NULL(typenam)                { EVSQL_FMT_BINARY, EVSQL_TYPE_ ## typenam, { true } }
 
 /**
  * End marker for a `struct evsql_item_info` array.
  *
  * @see struct evsql_item_info
  */
-#define EVSQL_TYPE_END                          { EVSQL_FMT_BINARY, EVSQL_TYPE_INVALID      }
+#define EVSQL_TYPE_END                          EVSQL_TYPE(INVALID)
 
 /**
  * Initializer block for an evsql_query_params struct
@@ -671,7 +668,7 @@
  * @param res the result handle passed to evsql_query_cb()
  * @return zero on success, EIO on SQL error, positive error code otherwise
  */
-err_t evsql_result_check (struct evsql_result *res);
+evsql_err_t evsql_result_check (struct evsql_result *res);
 
 /**
  * The iterator-based interface results interface.
@@ -690,7 +687,7 @@
  * @param res the result handle passed to evsql_query_cb()
  * @return zero on success, +err on error
  */
-err_t evsql_result_begin (struct evsql_result_info *info, struct evsql_result *res);
+evsql_err_t evsql_result_begin (struct evsql_result_info *info, struct evsql_result *res);
 
 /**
  * Reads the next result row from the result prepared using evsql_result_begin. Stores the field values into to given
diff -r 07c14d83c698 -r 76a782abddca src/result.c
--- a/src/result.c	Sun Mar 08 02:48:29 2009 +0200
+++ b/src/result.c	Mon Mar 16 21:48:13 2009 +0200
@@ -86,12 +86,12 @@
     return -1;
 }
 
-err_t evsql_result_check (struct evsql_result *res) {
+evsql_err_t evsql_result_check (struct evsql_result *res) {
     // so simple...
     return res->error ? EIO : 0;
 }
 
-err_t evsql_result_begin (struct evsql_result_info *info, struct evsql_result *res) {
+evsql_err_t evsql_result_begin (struct evsql_result_info *info, struct evsql_result *res) {
     struct evsql_item_info *col;
     size_t cols = 0, nrows;
     err_t err;