From 47bc0aab79f3d563e29998563aae8fca1d5217d2 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 18 Apr 2013 19:14:10 +0200
Subject: [PATCH] sodium_init() doesn't take any options any more.

---
 README.markdown                     | 2 +-
 src/libsodium/include/sodium/core.h | 2 +-
 src/libsodium/sodium/core.c         | 4 +---
 test/default/cmptest.h              | 4 +++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.markdown b/README.markdown
index 08230298..8b12369a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -75,7 +75,7 @@ A convenience header includes everything you need to use the library:
 
 Before doing anything else with the library, call:
 
-    sodium_init(NULL);
+    sodium_init();
 
 And if you need to release memory and other resources possibly
 allocated by the library, call:
diff --git a/src/libsodium/include/sodium/core.h b/src/libsodium/include/sodium/core.h
index a7e53004..a22dabfb 100644
--- a/src/libsodium/include/sodium/core.h
+++ b/src/libsodium/include/sodium/core.h
@@ -4,7 +4,7 @@
 
 typedef struct sodium_options sodium_options;
 
-int  sodium_init(const sodium_options *options);
+int  sodium_init(void);
 int  sodium_reinit(void);
 void sodium_shutdown(void);
 
diff --git a/src/libsodium/sodium/core.c b/src/libsodium/sodium/core.c
index 020c042b..09267b76 100644
--- a/src/libsodium/sodium/core.c
+++ b/src/libsodium/sodium/core.c
@@ -2,10 +2,8 @@
 #include "core.h"
 
 int
-sodium_init(const sodium_options *options)
+sodium_init(void)
 {
-    (void) options;
-
     return 0;
 }
 
diff --git a/test/default/cmptest.h b/test/default/cmptest.h
index 28e12acf..ba6874c9 100644
--- a/test/default/cmptest.h
+++ b/test/default/cmptest.h
@@ -21,7 +21,9 @@ int main(void)
         perror("fopen(" TEST_NAME_RES ")");
         return 99;
     }
-    sodium_init(NULL);
+    if (sodium_init() != 0) {
+        return 99;
+    }
     xmain();
     sodium_shutdown();
     rewind(fp_res);