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
Avoid to stick on event loop
[src/app-framework-binder.git]
/
src
/
afb-api-so.c
diff --git
a/src/afb-api-so.c
b/src/afb-api-so.c
index
d673d0e
..
a22e444
100644
(file)
--- a/
src/afb-api-so.c
+++ b/
src/afb-api-so.c
@@
-27,15
+27,9
@@
#include "afb-api-so.h"
#include "afb-api-so-v1.h"
#include "afb-api-so.h"
#include "afb-api-so-v1.h"
+#include "afb-api-so-v2.h"
#include "verbose.h"
#include "verbose.h"
-int afb_api_so_timeout = 15;
-
-void afb_api_so_set_timeout(int to)
-{
- afb_api_so_timeout = to;
-}
-
static int load_binding(const char *path, int force)
{
int rc;
static int load_binding(const char *path, int force)
{
int rc;
@@
-53,9
+47,14
@@
static int load_binding(const char *path, int force)
}
/* retrieves the register function */
}
/* retrieves the register function */
+ rc = afb_api_so_v2_add(path, handle);
+ if (rc < 0) {
+ /* error when loading a valid v2 binding */
+ goto error2;
+ }
rc = afb_api_so_v1_add(path, handle);
if (rc < 0) {
rc = afb_api_so_v1_add(path, handle);
if (rc < 0) {
- /* error when loading a valid v
&
binding */
+ /* error when loading a valid v
1
binding */
goto error2;
}
if (rc == 0) {
goto error2;
}
if (rc == 0) {