Add flags management to sass, refactor some things

4 files changed, 26 insertions, 12 deletions

diff --git a/src/include/skalibs/sass.h b/src/include/skalibs/sass.h
new file mode 100644
index 0000000..b2b1f47
--- /dev/null
+++ b/src/include/skalibs/sass.h
@@ -0,0 +1,11 @@
+/* ISC license. */
+
+#ifndef SKALIBS_SASS_H
+#define SKALIBS_SASS_H
+
+enum sass_flags_e
+{
+  SASS_FLAGS_KEEP = 0x01,
+} ;
+
+#endif
diff --git a/src/include/skalibs/sassclient.h b/src/include/skalibs/sassclient.h
index b932414..ce79477 100644
--- a/src/include/skalibs/sassclient.h
+++ b/src/include/skalibs/sassclient.h
@@ -26,19 +26,21 @@ typedef sassclient_cb_func *sassclient_cb_func_ref ;
 
 extern int sassclient_start (sassclient *, char const *const *, char const *, char const *, tain const *, tain *) ;
 #define sassclient_start_g(a, argv, banner1, banner2, deadline) sassclient_start(a, argv, banner1, banner2, (deadline), &STAMP)
-extern void sassclient_end (sassclient *) ;
-
-#define sassclient_fd(a) textclient_fd(&(a)->connection)
-extern int sassclient_update (sassclient *) ;
-extern int sassclient_ack (sassclient *, uint32_t *, int *) ;
 
-extern int sassclient_send (sassclient *, uint32_t *, uint32_t, uint32_t, char const *, size_t, sassclient_cb_func_ref, void *, tain const *, tain *) ;
-#define sassclient_send_g(a, id, timeout, opcode, s, len, cb, data, deadline) sassclient_send(a, id, timeout, opcode, s, len, cb, data, (deadline), &STAMP)
+extern int sassclient_send (sassclient *, uint32_t *, uint32_t, uint32_t, uint32_t, char const *, size_t, sassclient_cb_func_ref, void *, tain const *, tain *) ;
+#define sassclient_send_g(a, id, flags, timeout, opcode, s, len, cb, data, deadline) sassclient_send(a, id, flags, timeout, opcode, s, len, cb, data, (deadline), &STAMP)
 
-extern int sassclient_sendv (sassclient *, uint32_t *, uint32_t, uint32_t, struct iovec const *, unsigned int, sassclient_cb_func_ref, void *, tain const *, tain *) ;
-#define sassclient_sendv_g(a, id, timeout, opcode, v, n, cb, data, deadline) sassclient_sendv(a, id, timeout, opcode, v, n, cb, data, (deadline), &STAMP)
+extern int sassclient_sendv (sassclient *, uint32_t *, uint32_t, uint32_t, uint32_t, struct iovec const *, unsigned int, sassclient_cb_func_ref, void *, tain const *, tain *) ;
+#define sassclient_sendv_g(a, id, flags, timeout, opcode, v, n, cb, data, deadline) sassclient_sendv(a, id, flags, timeout, opcode, v, n, cb, data, (deadline), &STAMP)
 
 extern int sassclient_cancel (sassclient *, uint32_t, tain const *, tain *) ;
 #define sassclient_cancel_g(a, id, deadline) sassclient_cancel(a, id, (deadline), &STAMP)
 
+#define sassclient_fd(a) textclient_fd(&(a)->connection)
+extern int sassclient_update (sassclient *) ;
+extern int sassclient_ack (sassclient *, uint32_t *, int *) ;
+extern void sassclient_release (sassclient *, uint32_t) ;
+
+extern void sassclient_end (sassclient *) ;
+
 #endif
diff --git a/src/include/skalibs/sassserver.h b/src/include/skalibs/sassserver.h
index b17df8b..f43ea4c 100644
--- a/src/include/skalibs/sassserver.h
+++ b/src/include/skalibs/sassserver.h
@@ -9,7 +9,7 @@
 #include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 
-typedef int sassserver_send_func (void *, uint32_t, uint32_t, char const *, size_t) ;
+typedef int sassserver_send_func (void *, uint32_t, uint32_t, uint32_t, char const *, size_t) ;
 typedef sassserver_send_func *sassserver_send_func_ref ;
 
 typedef void sassserver_cancel_func (void *) ;
@@ -23,7 +23,7 @@ extern int sassserver_event (iopause_fd const *) ;
 extern void *sassserver_data (uint32_t) ;
 
 extern void sassserver_async_failure (uint32_t, int) ;
-extern void sassserver_async_success (uint32_t, char const *, size_t) ;
-extern void sassserver_async_successv (uint32_t, struct iovec const *, unsigned int) ;
+extern void sassserver_async_success (uint32_t, uint32_t, char const *, size_t) ;
+extern void sassserver_async_successv (uint32_t, uint32_t, struct iovec const *, unsigned int) ;
 
 #endif
diff --git a/src/include/skalibs/unixonacid.h b/src/include/skalibs/unixonacid.h
index 1cba96a..c8981cb 100644
--- a/src/include/skalibs/unixonacid.h
+++ b/src/include/skalibs/unixonacid.h
@@ -12,6 +12,7 @@
 #include <skalibs/unixconnection.h>
 #include <skalibs/kolbak.h>
 #include <skalibs/skaclient.h>
+#include <skalibs/sass.h>
 #include <skalibs/sassclient.h>
 #include <skalibs/sassserver.h>