diff options
| author | dimitri staessens <[email protected]> | 2017-10-12 02:15:39 +0200 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2017-10-14 13:19:10 +0200 |
| commit | bedd1d4eadde9ab64f924c69eba716b015599e67 (patch) | |
| tree | b521ef89c8752334448bee1582b51dbe97851839 /src/irmd | |
| parent | a483bc8597e5c19e796dc55c0587f1a045bc7281 (diff) | |
| download | ouroboros-bedd1d4eadde9ab64f924c69eba716b015599e67.tar.gz ouroboros-bedd1d4eadde9ab64f924c69eba716b015599e67.zip | |
lib: Deprecate ouroboros_init and ourboros_fini
This commit deprecates ouroboros_init and ouroboros_fini and adds them
as a constructor or destructor, causing these function to be run
automatically when a program that links to the library calls and exits
main(). For this to fully work, the library had to be split so that we
can avoid the irmd calling these functions (the IRMd has to create the
shm structures on which these calls depend).
The library is split in 3 parts: libouroboros-dev, libouroboros-irm
and libouroboros-common. The latter is linked to the other two so that
including libouroboros-dev or libouroboros-irm will also link
libouroboros-common.
Diffstat (limited to 'src/irmd')
| -rw-r--r-- | src/irmd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/irmd/main.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt index de883d63..55288263 100644 --- a/src/irmd/CMakeLists.txt +++ b/src/irmd/CMakeLists.txt @@ -41,7 +41,7 @@ set(SOURCE_FILES add_executable (irmd ${SOURCE_FILES}) -target_link_libraries (irmd LINK_PUBLIC ouroboros) +target_link_libraries (irmd LINK_PUBLIC ouroboros-common) include(AddCompileFlags) if (CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/src/irmd/main.c b/src/irmd/main.c index 99a34af2..80417806 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1120,7 +1120,6 @@ static int flow_accept(pid_t api, e = api_table_get(&irmd.api_table, api); if (e == NULL) { - /* Can only happen if server called ouroboros_init(NULL); */ pthread_rwlock_unlock(&irmd.reg_lock); log_err("Unknown instance %d calling accept.", api); return -EINVAL; |