Some versions of the HP C Compiler don't export functions that take

function pointers as arguments unless a typedef is used.

diff --git a/include/sudo_fatal.h b/include/sudo_fatal.h
index 36051f20cda98059a17cae9c1b267c5a72458338..3250a6142581153ab852f5cfa1ad51d1816b4106 100644 (file)
--- a/include/sudo_fatal.h
+++ b/include/sudo_fatal.h
@@ -112,10 +112,13 @@
 } while (0)
 #endif /* SUDO_ERROR_WRAP */
 
+/* XXX - move to sudo_util.h */
 extern int (*sudo_printf)(int msg_type, const char *fmt, ...);
 
-__dso_public int  sudo_fatal_callback_deregister_v1(void (*func)(void));
-__dso_public int  sudo_fatal_callback_register_v1(void (*func)(void));
+typedef void (*sudo_fatal_callback_t)(void);
+
+__dso_public int  sudo_fatal_callback_deregister_v1(sudo_fatal_callback_t func);
+__dso_public int  sudo_fatal_callback_register_v1(sudo_fatal_callback_t func);
 __dso_public char *sudo_warn_gettext_v1(const char *msgid) __format_arg(1);
 __dso_public char *sudo_warn_strerror_v1(int errnum);
 __dso_public void sudo_fatal_nodebug_v1(const char *, ...) __printf0like(1, 2) __attribute__((__noreturn__));

diff --git a/include/sudo_lbuf.h b/include/sudo_lbuf.h
index bdf1ae031545729ee52bc0e6e4761e0c41210296..18cf23c990f0a9aed5f803d89fff2c7fea0f9368 100644 (file)
--- a/include/sudo_lbuf.h
+++ b/include/sudo_lbuf.h
@@ -33,7 +33,9 @@ struct sudo_lbuf {
     int cols;
 };
 
-__dso_public void sudo_lbuf_init_v1(struct sudo_lbuf *lbuf, int (*output)(const char *), int indent, const char *continuation, int cols);
+typedef int (*sudo_lbuf_output_t)(const char *);
+
+__dso_public void sudo_lbuf_init_v1(struct sudo_lbuf *lbuf, sudo_lbuf_output_t output, int indent, const char *continuation, int cols);
 __dso_public void sudo_lbuf_destroy_v1(struct sudo_lbuf *lbuf);
 __dso_public void sudo_lbuf_append_v1(struct sudo_lbuf *lbuf, const char *fmt, ...) __printflike(2, 3);
 __dso_public void sudo_lbuf_append_quoted_v1(struct sudo_lbuf *lbuf, const char *set, const char *fmt, ...) __printflike(3, 4);

diff --git a/lib/util/fatal.c b/lib/util/fatal.c
index 7bd6aae5adf98a8d80cf707ed01c8ab5dbba0d5c..c4a7603cc57abcd43ccaada4b04c02e073bd193a 100644 (file)
--- a/lib/util/fatal.c
+++ b/lib/util/fatal.c
@@ -158,7 +158,7 @@ _warning(int errnum, const char *fmt, va_list ap)
  * Register a callback to be run when sudo_fatal()/sudo_fatalx() is called.
  */
 int
-sudo_fatal_callback_register_v1(void (*func)(void))
+sudo_fatal_callback_register_v1(sudo_fatal_callback_t func)
 {
     struct sudo_fatal_callback *cb;
 
@@ -182,7 +182,7 @@ sudo_fatal_callback_register_v1(void (*func)(void))
  * Deregister a sudo_fatal()/sudo_fatalx() callback.
  */
 int
-sudo_fatal_callback_deregister_v1(void (*func)(void))
+sudo_fatal_callback_deregister_v1(sudo_fatal_callback_t func)
 {
     struct sudo_fatal_callback *cb, **prev;
 

diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c
index e274c8a9ed8ce91cad7390cab16a946f95db5ab3..58ef06376dc2653030fc773bc73851ec00e431f9 100644 (file)
--- a/lib/util/lbuf.c
+++ b/lib/util/lbuf.c
@@ -48,7 +48,7 @@
 #include "sudo_lbuf.h"
 
 void
-sudo_lbuf_init_v1(struct sudo_lbuf *lbuf, int (*output)(const char *),
+sudo_lbuf_init_v1(struct sudo_lbuf *lbuf, sudo_lbuf_output_t output,
     int indent, const char *continuation, int cols)
 {
     debug_decl(sudo_lbuf_init, SUDO_DEBUG_UTIL)