From 9c613c2e0cfd1b08c4682566eda0e5fde34e83a3 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 27 May 2015 12:41:43 +0200
Subject: [PATCH] Have main() return a value

---
 demos/auth.c              | 7 ++-----
 demos/box.c               | 7 ++-----
 demos/box_old.c           | 7 ++-----
 demos/generichash.c       | 4 ++--
 demos/generichashstream.c | 4 ++--
 demos/hash.c              | 4 ++--
 demos/onetimeauth.c       | 7 ++-----
 demos/secretbox.c         | 7 ++-----
 demos/shorthash.c         | 4 ++--
 demos/sign.c              | 7 ++-----
 demos/stream.c            | 7 ++-----
 11 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/demos/auth.c b/demos/auth.c
index 77dd3df4..b63da698 100644
--- a/demos/auth.c
+++ b/demos/auth.c
@@ -65,14 +65,11 @@ auth(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
-    int r;
-
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
-    r = (0 == auth() ? EXIT_SUCCESS : EXIT_FAILURE);
-    exit(r);
+    return auth() != 0;
 }
 
diff --git a/demos/box.c b/demos/box.c
index c2c93706..d076f118 100644
--- a/demos/box.c
+++ b/demos/box.c
@@ -117,14 +117,11 @@ box(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
-    int r;
-
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
-    r = (0 == box() ? EXIT_SUCCESS : EXIT_FAILURE);
-    exit(r);
+    return box() != 0;
 }
 
diff --git a/demos/box_old.c b/demos/box_old.c
index 7cc1f945..1597dbf3 100644
--- a/demos/box_old.c
+++ b/demos/box_old.c
@@ -144,14 +144,11 @@ box(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
-    int r;
-
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
-    r = (0 == box() ? EXIT_SUCCESS : EXIT_FAILURE);
-    exit(r);
+    return box() != 0;
 }
 
diff --git a/demos/generichash.c b/demos/generichash.c
index a8b2d435..eeef43bd 100644
--- a/demos/generichash.c
+++ b/demos/generichash.c
@@ -46,12 +46,12 @@ generichash(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
     generichash();
-    exit(EXIT_SUCCESS);
+    return 0;
 }
 
diff --git a/demos/generichashstream.c b/demos/generichashstream.c
index 63d7a2e6..37ced3a4 100644
--- a/demos/generichashstream.c
+++ b/demos/generichashstream.c
@@ -55,12 +55,12 @@ generichashstream(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
     generichashstream();
-    exit(EXIT_SUCCESS);
+    return 0;
 }
 
diff --git a/demos/hash.c b/demos/hash.c
index 167a3b26..6cf34215 100644
--- a/demos/hash.c
+++ b/demos/hash.c
@@ -38,12 +38,12 @@ hash(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
     hash();
-    exit(EXIT_SUCCESS);
+    return 0;
 }
 
diff --git a/demos/onetimeauth.c b/demos/onetimeauth.c
index fcacdbb8..4944d230 100644
--- a/demos/onetimeauth.c
+++ b/demos/onetimeauth.c
@@ -69,14 +69,11 @@ onetimeauth(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
-    int r;
-
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
-    r = (0 == onetimeauth() ? EXIT_SUCCESS : EXIT_FAILURE);
-    exit(r);
+    return onetimeauth() != 0;
 }
 
diff --git a/demos/secretbox.c b/demos/secretbox.c
index 4a043f24..2823f592 100644
--- a/demos/secretbox.c
+++ b/demos/secretbox.c
@@ -97,14 +97,11 @@ secretbox(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
-    int r;
-
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
-    r = (0 == secretbox() ? EXIT_SUCCESS : EXIT_FAILURE);
-    exit(r);
+    return secretbox() != 0;
 }
 
diff --git a/demos/shorthash.c b/demos/shorthash.c
index fb12ce1f..b16f96c0 100644
--- a/demos/shorthash.c
+++ b/demos/shorthash.c
@@ -43,12 +43,12 @@ shorthash(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
     shorthash();
-    exit(EXIT_SUCCESS);
+    return 0;
 }
 
diff --git a/demos/sign.c b/demos/sign.c
index 345b436b..181b3fec 100644
--- a/demos/sign.c
+++ b/demos/sign.c
@@ -84,14 +84,11 @@ sign(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
-    int r;
-
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
-    r = (0 == sign() ? EXIT_SUCCESS : EXIT_FAILURE);
-    exit(r);
+    return sign() != 0;
 }
 
diff --git a/demos/stream.c b/demos/stream.c
index 459748e7..aca4510c 100644
--- a/demos/stream.c
+++ b/demos/stream.c
@@ -77,14 +77,11 @@ stream(void)
 }
 
 int
-main(int argc, char **argv)
+main(void)
 {
-    int r;
-
     sodium_init();
     printf("Using LibSodium %s\n", sodium_version_string());
 
-    r = (0 == stream() ? EXIT_SUCCESS : EXIT_FAILURE);
-    exit(r);
+    return stream() != 0;
 }