summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2017-08-25 22:39:33 +0200
committerRich Salz <rsalz@openssl.org>2017-08-28 08:52:02 -0400
commit4871fa49cdd0d4473b6a815fc01fbde3e6ced339 (patch)
tree11f329d58a4da8426c2e1942a3251d279bf1e81f /include
parentaa048aef0b9146f90c06333dedfc105d1f9e2c22 (diff)
RAND: Rename the RAND_poll_ex() callback and its typedef
With the introduction of RAND_poll_ex(), the `RAND_add()` calls were replaced by meaningless cb(...). This commit changes the 'cb(...)' calls back to 'rand_add(...)' calls by changing the signature as follows: -int RAND_poll_ex(RAND_poll_fn cb, void *arg); +int RAND_poll_ex(RAND_poll_cb rand_add, void *arg); Changed the function typedef name to 'RAND_poll_cb' to emphasize the fact that the function type represents a callback function. Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4266)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/rand.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/openssl/rand.h b/include/openssl/rand.h
index a8c1943d91..82e3762690 100644
--- a/include/openssl/rand.h
+++ b/include/openssl/rand.h
@@ -61,10 +61,10 @@ int RAND_egd(const char *path);
int RAND_egd_bytes(const char *path, int bytes);
# endif
-typedef void (*RAND_poll_fn)(void *arg,
+typedef void (*RAND_poll_cb)(void *arg,
const void *buf, int num, double randomness);
int RAND_poll(void);
-int RAND_poll_ex(RAND_poll_fn cb, void *arg);
+int RAND_poll_ex(RAND_poll_cb rand_add, void *arg);
# if defined(_WIN32) && (defined(BASETYPES) || defined(_WINDEF_H))
/* application has to include <windows.h> in order to use these */