Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix unexpected ending spaces
[src/app-framework-binder.git]
/
src
/
afb-ws.c
diff --git
a/src/afb-ws.c
b/src/afb-ws.c
index
5e8732d
..
53fb60a
100644
(file)
--- a/
src/afb-ws.c
+++ b/
src/afb-ws.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright
2016 IoT.bzh
+ * Copyright
(C) 2016 "IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-135,10
+135,12
@@
static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, voi
* Creates the afb_ws structure for the file descritor
* 'fd' and the callbacks described by the interface 'itf'
* and its 'closure'.
* Creates the afb_ws structure for the file descritor
* 'fd' and the callbacks described by the interface 'itf'
* and its 'closure'.
+ * When the creation is a success, the systemd event loop 'eloop' is
+ * used for handling event for 'fd'.
*
* Returns the handle for the afb_ws created or NULL on error.
*/
*
* Returns the handle for the afb_ws created or NULL on error.
*/
-struct afb_ws *afb_ws_create(int fd, const struct afb_ws_itf *itf, void *closure)
+struct afb_ws *afb_ws_create(
struct sd_event *eloop,
int fd, const struct afb_ws_itf *itf, void *closure)
{
int rc;
struct afb_ws *result;
{
int rc;
struct afb_ws *result;
@@
-164,7
+166,7
@@
struct afb_ws *afb_ws_create(int fd, const struct afb_ws_itf *itf, void *closure
goto error2;
/* creates the evsrc */
goto error2;
/* creates the evsrc */
- rc = sd_event_add_io(
afb_common_get_event_loop()
, &result->evsrc, result->fd, EPOLLIN, io_event_callback, result);
+ rc = sd_event_add_io(
eloop
, &result->evsrc, result->fd, EPOLLIN, io_event_callback, result);
if (rc < 0) {
errno = -rc;
goto error3;
if (rc < 0) {
errno = -rc;
goto error3;
@@
-272,6
+274,7
@@
int afb_ws_texts(struct afb_ws *ws, ...)
}
ios[count].iov_base = (void*)s;
ios[count].iov_len = strlen(s);
}
ios[count].iov_base = (void*)s;
ios[count].iov_len = strlen(s);
+ count++;
s = va_arg(args, const char *);
}
va_end(args);
s = va_arg(args, const char *);
}
va_end(args);