Merged in dstaesse/ouroboros/be-deprecate-ouroboros-init-fini (pull request #626)

Be deprecate ouroboros init fini

2 files changed, 1 insertions, 14 deletions

diff --git a/src/tools/cbr/CMakeLists.txt b/src/tools/cbr/CMakeLists.txt
index 1883141c..2a64a65b 100644
--- a/src/tools/cbr/CMakeLists.txt
+++ b/src/tools/cbr/CMakeLists.txt
@@ -11,6 +11,6 @@ set(SOURCE_FILES
 
 add_executable(cbr ${SOURCE_FILES})
 
-target_link_libraries(cbr LINK_PUBLIC ouroboros)
+target_link_libraries(cbr LINK_PUBLIC ouroboros-dev)
 
 install(TARGETS cbr RUNTIME DESTINATION usr/bin)
diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c
index 14613198..afa9b535 100644
--- a/src/tools/cbr/cbr.c
+++ b/src/tools/cbr/cbr.c
@@ -72,7 +72,6 @@ int main(int argc, char ** argv)
         int    ret = 0;
         char * rem = NULL;
         char * s_apn = NULL;
-        char ** argv_dup = argv;
 
         bool server = false;
 
@@ -129,18 +128,8 @@ int main(int argc, char ** argv)
         }
 
         if (server) {
-                if (ouroboros_init(argv_dup[0]) < 0) {
-                        printf("Failed to init.\n");
-                        exit(EXIT_FAILURE);
-                }
-
                 ret = server_main();
         } else {
-                if (ouroboros_init(NULL) < 0) {
-                        printf("Failed to init.\n");
-                        exit(EXIT_FAILURE);
-                }
-
                 if (s_apn == NULL) {
                         printf("No server specified.\n");
                         usage();
@@ -150,7 +139,5 @@ int main(int argc, char ** argv)
                 ret = client_main(s_apn, duration, size, rate, flood, sleep);
         }
 
-        ouroboros_fini();
-
         return ret;
 }