[PATCH] smbreadline: switch to new-style readline typedef
Jeremy Allison
jra at samba.org
Mon Mar 3 13:57:50 MST 2014
On Mon, Mar 03, 2014 at 08:43:47AM -0300, Gustavo Zacarias wrote:
> Function, CPFunction, CPPFunction and VFunction typedefs are considered
> old-style (deprecated) starting from readline 4.2.
> Compatibility typedefs have been in place up to readline 6.2 but were
> removed with the 6.3 release thus causing builds to break.
> Swtich to the new-style specific prototyped typedef.
>
> Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
> ---
> libcli/smbreadline/smbreadline.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
> index cff25a7..80e10b0 100644
> --- a/libcli/smbreadline/smbreadline.c
> +++ b/libcli/smbreadline/smbreadline.c
> @@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
>
> #if HAVE_DECL_RL_EVENT_HOOK
> if (callback)
> - rl_event_hook = (Function *)callback;
> + rl_event_hook = (rl_hook_func_t *)callback;
> #endif
> ret = readline(prompt);
> if (ret && *ret)
> --
> 1.8.3.2
A question - rl_hook_func_t is defined here:
http://www.delorie.com/gnu/docs/readline/rlman_26.html
as 'typedef int rl_hook_func_t (void);'
However, callback is defined in the Samba code as :
void (*callback)(void).
Should we also update the callback() definitions ?
Jeremy.
More information about the samba-technical
mailing list