From ab23649de505953cfc5bb94813163be6cc41c441 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 18 Apr 2013 12:43:31 +0200
Subject: [PATCH] Shorten randombytes_implementation members.

---
 src/libsodium/include/sodium/randombytes.h | 12 +++++------
 src/libsodium/randombytes/randombytes.c    | 24 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/libsodium/include/sodium/randombytes.h b/src/libsodium/include/sodium/randombytes.h
index dba2cb42..91c1e7b4 100644
--- a/src/libsodium/include/sodium/randombytes.h
+++ b/src/libsodium/include/sodium/randombytes.h
@@ -12,12 +12,12 @@ extern "C" {
 #include <stdio.h>
 
 typedef struct randombytes_implementation {
-    const char *(*randombytes_implementation_name)(void);
-    uint32_t    (*randombytes_random)(void);
-    void        (*randombytes_stir)(void);
-    uint32_t    (*randombytes_uniform)(const uint32_t upper_bound);
-    void        (*randombytes_buf)(void * const buf, const size_t size);
-    int         (*randombytes_close)(void);
+    const char *(*implementation_name)(void);
+    uint32_t    (*random)(void);
+    void        (*stir)(void);
+    uint32_t    (*uniform)(const uint32_t upper_bound);
+    void        (*buf)(void * const buf, const size_t size);
+    int         (*close)(void);
 } randombytes_implementation;
 
 int         randombytes_set_implementation(randombytes_implementation *impl);
diff --git a/src/libsodium/randombytes/randombytes.c b/src/libsodium/randombytes/randombytes.c
index c53b1d47..380ada5e 100644
--- a/src/libsodium/randombytes/randombytes.c
+++ b/src/libsodium/randombytes/randombytes.c
@@ -9,12 +9,12 @@
 #include "randombytes_sysrandom.h"
 
 static randombytes_implementation implementation = {
-    .randombytes_implementation_name = sysrandom_implementation_name,
-    .randombytes_random = sysrandom,
-    .randombytes_stir = sysrandom_stir,
-    .randombytes_uniform = sysrandom_uniform,
-    .randombytes_buf = sysrandom_buf,
-    .randombytes_close = sysrandom_close
+    .implementation_name = sysrandom_implementation_name,
+    .random = sysrandom,
+    .stir = sysrandom_stir,
+    .uniform = sysrandom_uniform,
+    .buf = sysrandom_buf,
+    .close = sysrandom_close
 };
 
 int
@@ -28,37 +28,37 @@ randombytes_set_implementation(randombytes_implementation *impl)
 const char *
 randombytes_implementation_name(void)
 {
-    return implementation.randombytes_implementation_name();
+    return implementation.implementation_name();
 }
 
 uint32_t
 randombytes_random(void)
 {
-    return implementation.randombytes_random();
+    return implementation.random();
 }
 
 void
 randombytes_stir(void)
 {
-    return implementation.randombytes_stir();
+    return implementation.stir();
 }
 
 uint32_t
 randombytes_uniform(const uint32_t upper_bound)
 {
-    return implementation.randombytes_uniform(upper_bound);
+    return implementation.uniform(upper_bound);
 }
 
 void
 randombytes_buf(void * const buf, const size_t size)
 {
-    return implementation.randombytes_buf(buf, size);
+    return implementation.buf(buf, size);
 }
 
 int
 randombytes_close(void)
 {
-    return implementation.randombytes_close();
+    return implementation.close();
 }
 
 void