Make the switch to custom headers

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 9 insertions, 16 deletions

diff --git a/src/include/tipidee/response.h b/src/include/tipidee/response.h
index bc83fc6..ea0e835 100644
--- a/src/include/tipidee/response.h
+++ b/src/include/tipidee/response.h
@@ -15,6 +15,7 @@
 #include <skalibs/tai.h>
 
 #include <tipidee/rql.h>
+#include <tipidee/headers.h>
 
 typedef struct tipidee_response_header_s tipidee_response_header, *tipidee_response_header_ref ;
 struct tipidee_response_header_s
@@ -24,13 +25,6 @@ struct tipidee_response_header_s
   uint8_t options ;
 } ;
 
-typedef struct tipidee_response_header_builtin_s tipidee_response_header_builtin, *tipidee_response_header_builtin_ref ;
-struct tipidee_response_header_builtin_s
-{
-  char const *key ;
-  char const *value ;
-} ;
-
 extern size_t tipidee_response_status (buffer *, tipidee_rql const *, unsigned int, char const *) ;
 
 extern size_t tipidee_response_header_date_fmt (char *, size_t, tain const *) ;
@@ -38,17 +32,16 @@ extern size_t tipidee_response_header_date (char *, size_t, tain const *) ;
 #define tipidee_response_header_date_g(buf, max) tipidee_response_header_date(buf, (max), &STAMP)
 extern size_t tipidee_response_header_lastmodified (char *, size_t, struct stat const *) ;
 
-extern size_t tipidee_response_header_common_put (buffer *, uint32_t, tain const *) ;
-#define tipidee_response_header_common_put_g(b, options) tipidee_response_header_common_put(b, (options), &STAMP)
-
-size_t tipidee_response_file (buffer *, tipidee_rql const *, unsigned int, char const *, struct stat const *, char const *, uint32_t, tain const *) ;
-#define tipidee_response_file_g(b, rql, status, reason, st, ct, options) tipidee_response_file(b, rql, status, reason, st, ct, (options), &STAMP)
+extern size_t tipidee_response_header_writeall (buffer *, tipidee_response_header const *, uint32_t, uint32_t, tain const *) ;
+#define tipidee_response_header_writeall_g(b, rhdr, rhdrn, options) tipidee_response_header_writeall(b, rhdr, rhdrn, (options), &STAMP)
+extern size_t tipidee_response_header_writemerge (buffer *, tipidee_response_header const *, uint32_t, tipidee_headers const *, uint32_t, tain const *) ;
+#define tipidee_response_header_writemerge_g(b, rhdr, rhdrn, hdr, options) tipidee_response_header_writemerge(b, rhdr, rhdrn, hdr, (options), &STAMP)
 
-extern size_t tipidee_response_error_nofile (buffer *, tipidee_rql const *, unsigned int, char const *, char const *, uint32_t, tain const *) ;
-#define tipidee_response_error_nofile_g(b, rql, status, reason, text, options) tipidee_response_error_nofile(b, rql, status, reason, text, (options), &STAMP)
+size_t tipidee_response_file (buffer *, tipidee_rql const *, unsigned int, char const *, struct stat const *, char const *, tipidee_response_header const *, uint32_t, uint32_t, tain const *) ;
+#define tipidee_response_file_g(b, rql, status, reason, st, ct, rhdr, rhdrn, options) tipidee_response_file(b, rql, status, reason, st, ct, rhdr, rhdrn, (options), &STAMP)
 
-extern tipidee_response_header_builtin const *tipidee_response_header_builtin_table ;
-extern char const *tipidee_response_header_builtin_search (char const *) ;
+extern size_t tipidee_response_error_nofile (buffer *, tipidee_rql const *, unsigned int, char const *, char const *, tipidee_response_header const *, uint32_t, uint32_t, tain const *) ;
+#define tipidee_response_error_nofile_g(b, rql, status, reason, text, rhdr, rhdrn, options) tipidee_response_error_nofile(b, rql, status, reason, text, rhdr, rhdrn, (options), &STAMP)
 
 extern int tipidee_response_header_preparebuiltin (tipidee_response_header *, uint32_t, char const *, size_t) ;