X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-wsj1.c;h=79cb66e9131c078beec9c202f248f5972332f5fb;hb=4f7f5ae8e1907b23cb74178dea68790a6fa963fe;hp=be961f5156780cba57cfe59cc1f5435a38059a54;hpb=727e705706be47066893bd483458c23e4c4e173c;p=src%2Fapp-framework-binder.git diff --git a/src/afb-wsj1.c b/src/afb-wsj1.c index be961f51..79cb66e9 100644 --- a/src/afb-wsj1.c +++ b/src/afb-wsj1.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 "IoT.bzh" + * Copyright (C) 2016, 2017, 2018 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,6 +29,7 @@ #include "afb-ws.h" #include "afb-wsj1.h" +#include "fdev.h" #define CALL 2 #define RETOK 3 @@ -81,12 +82,11 @@ struct afb_wsj1 pthread_mutex_t mutex; }; -struct afb_wsj1 *afb_wsj1_create(struct sd_event *eloop, int fd, struct afb_wsj1_itf *itf, void *closure) +struct afb_wsj1 *afb_wsj1_create(struct fdev *fdev, struct afb_wsj1_itf *itf, void *closure) { struct afb_wsj1 *result; - assert(eloop); - assert(fd >= 0); + assert(fdev); assert(itf); assert(itf->on_call); @@ -103,7 +103,7 @@ struct afb_wsj1 *afb_wsj1_create(struct sd_event *eloop, int fd, struct afb_wsj1 if (result->tokener == NULL) goto error2; - result->ws = afb_ws_create(eloop, fd, &wsj1_itf, result); + result->ws = afb_ws_create(fdev, &wsj1_itf, result); if (result->ws == NULL) goto error3; @@ -114,7 +114,7 @@ error3: error2: free(result); error: - close(fd); + fdev_unref(fdev); return NULL; }