From d7242bda59ec2ec056508b39cb532b5e7318dd13 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 22 Dec 2017 17:37:09 +0000
Subject:  Port ftrigr and s6lock to textclient

---
 src/libs6/ftrigr_unsubscribe.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/libs6/ftrigr_unsubscribe.c')

diff --git a/src/libs6/ftrigr_unsubscribe.c b/src/libs6/ftrigr_unsubscribe.c
index a96ddb0..557f5ea 100644
--- a/src/libs6/ftrigr_unsubscribe.c
+++ b/src/libs6/ftrigr_unsubscribe.c
@@ -4,12 +4,13 @@
 #include <skalibs/uint16.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/gensetdyn.h>
-#include <skalibs/skaclient.h>
+#include <skalibs/textclient.h>
 #include <s6/ftrigr.h>
 
 int ftrigr_unsubscribe (ftrigr_t *a, uint16_t i, tain_t const *deadline, tain_t *stamp)
 {
   ftrigr1_t *p ;
+  char pack[3] = "--U" ;
   if (!i--) return (errno = EINVAL, 0) ;
   p = GENSETDYN_P(ftrigr1_t, &a->data, i) ;
   if (!p) return (errno = EINVAL, 0) ;
@@ -24,13 +25,8 @@ int ftrigr_unsubscribe (ftrigr_t *a, uint16_t i, tain_t const *deadline, tain_t
     }
     default : break ;
   }
-  {
-    char err ;
-    char pack[3] = "--U" ;
-    uint16_pack_big(pack, i) ;
-    if (!skaclient_send(&a->connection, pack, 3, &skaclient_default_cb, &err, deadline, stamp)) return 0 ;
-    if (err) return (errno = err, 0) ;
-  }
+  uint16_pack_big(pack, i) ;
+  if (!textclient_command(&a->connection, pack, 3, deadline, stamp)) return 0 ;
   stralloc_free(&p->what) ;
   *p = ftrigr1_zero ;
   return gensetdyn_delete(&a->data, i) ;
-- 
cgit v1.3.1