From 30c8d23aff39b520738cef2b90c4cbaa2039779b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 18 Apr 2002 18:41:27 +0000 Subject: [PATCH] * rndlinux.c, rndegd.c, rndunix.c (func_table): Made func a function pointer. Note that we still need to change the module interface to cope with data vs function pointer problems. Hmmm, even dlsym has a problem with this. --- cipher/ChangeLog | 7 +++++++ cipher/rndegd.c | 4 ++-- cipher/rndlinux.c | 4 ++-- cipher/rndunix.c | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 76db76885..86f61020f 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,10 @@ +2002-04-18 Werner Koch + + * rndlinux.c, rndegd.c, rndunix.c (func_table): Made func a + function pointer. Note that we still need to change the module + interface to cope with data vs function pointer problems. Hmmm, + even dlsym has a problem with this. + 2002-04-10 David Shaw * cipher.c (setup_cipher_table, cipher_open, cipher_encrypt, diff --git a/cipher/rndegd.c b/cipher/rndegd.c index 7579ba80e..64226eabb 100644 --- a/cipher/rndegd.c +++ b/cipher/rndegd.c @@ -215,9 +215,9 @@ const char * const gnupgext_version = "RNDEGD ($Revision$)"; static struct { int class; int version; - void *func; + int (*func)(void); } func_table[] = { - { 40, 1, gather_random }, + { 40, 1, (int (*)(void))gather_random }, }; diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c index 566d759f6..be333d2b3 100644 --- a/cipher/rndlinux.c +++ b/cipher/rndlinux.c @@ -183,9 +183,9 @@ const char * const gnupgext_version = "RNDLINUX ($Revision$)"; static struct { int class; int version; - void *func; + int (*func)(void); } func_table[] = { - { 40, 1, gather_random }, + { 40, 1, (int (*)(void))gather_random }, }; diff --git a/cipher/rndunix.c b/cipher/rndunix.c index 87e832785..a46b5ec97 100644 --- a/cipher/rndunix.c +++ b/cipher/rndunix.c @@ -857,9 +857,9 @@ const char * const gnupgext_version = "RNDUNIX ($Revision$)"; static struct { int class; int version; - void *func; + int (*func)(void); } func_table[] = { - { 40, 1, gather_random }, + { 40, 1, (int (*)(void))gather_random }, }; /****************