diff --git a/src/include/phigs/css.h b/src/include/phigs/css.h index ff09e9d..66e6b78 100644 --- a/src/include/phigs/css.h +++ b/src/include/phigs/css.h @@ -110,7 +110,7 @@ typedef struct _Css_ssl { El_handle last_el; } Css_ssl; -typedef int (*Css_func)(); +typedef int (*Css_func)(Css_handle, El_handle, caddr_t, Css_el_op); typedef struct _hash_block { Pint struct_id; @@ -260,7 +260,7 @@ int phg_css_struct_ref(Css_handle cssh, Css_el_op opcode); int phg_css_no_data(Css_handle cssh, El_handle elptr, - caddr_t *argdata, + caddr_t argdata, Css_el_op opcode); void phg_css_el_search(Css_handle cssh, Pint struct_id, diff --git a/src/include/phigs/err.h b/src/include/phigs/err.h index 30b48d1..8daad85 100644 --- a/src/include/phigs/err.h +++ b/src/include/phigs/err.h @@ -89,7 +89,7 @@ typedef struct _Err_struct { typedef Err_struct *Err_handle; -extern void (*phg_errhandle)(); + extern void (*phg_errhandle)(int, int, char*); #define ERR_SET_CUR_FUNC(erh, funcnum) \ ((erh)->cur_func_num = (funcnum)) @@ -192,8 +192,8 @@ void perr_log( */ void pset_err_hand( - void (*new_err_hand)(), - void (**old_err_hand)() + void (*new_err_hand)(int, int, char *), + void (**old_err_hand)(int, int, char *) ); /******************************************************************************* diff --git a/src/include/phigs/util/htab.h b/src/include/phigs/util/htab.h index d3b0e86..94a8a39 100644 --- a/src/include/phigs/util/htab.h +++ b/src/include/phigs/util/htab.h @@ -48,7 +48,7 @@ Hash_table phg_htab_create( void phg_htab_destroy( Hash_table htab, - void (*destroy_entry)() + void (*destroy_entry)(int, caddr_t) ); /******************************************************************************* diff --git a/src/libphigs/c_binding/cb_lite.c b/src/libphigs/c_binding/cb_lite.c index 0231eb4..c729bd4 100644 --- a/src/libphigs/c_binding/cb_lite.c +++ b/src/libphigs/c_binding/cb_lite.c @@ -37,12 +37,12 @@ * DESCR: inquire light source respresentation * RETURNS: N/A */ -void pinq_light_src_rep( ws_id, index, type, err_ind, rep) - Pint ws_id; - Pint index; - Pinq_type type; - Pint *err_ind; - Plight_src_bundle *rep; +void pinq_light_src_rep( + Pint ws_id, + Pint index, + Pinq_type type, + Pint *err_ind, + Plight_src_bundle *rep) { Phg_ret ret; Psl_ws_info *wsinfo; diff --git a/src/libphigs/css/css_el.c b/src/libphigs/css/css_el.c index a3e7da1..a234a92 100644 --- a/src/libphigs/css/css_el.c +++ b/src/libphigs/css/css_el.c @@ -472,10 +472,10 @@ int phg_css_struct_ref(Css_handle cssh, int phg_css_no_data(Css_handle cssh, El_handle elptr, - caddr_t *argdata, + caddr_t argdata, Css_el_op opcode) { - Phg_ret_q_content *ret_data = (Phg_ret_q_content *)argdata; + Phg_ret_q_content *ret_data = (Phg_ret_q_content *)(&argdata); switch (opcode) { case CSS_EL_INQ_CONTENT: @@ -484,7 +484,7 @@ int phg_css_no_data(Css_handle cssh, break; case CSS_EL_INQ_TYPE_SIZE: - ARGS_INQ_SIZE(argdata) = 0; + ARGS_INQ_SIZE(&argdata) = 0; break; default: diff --git a/src/libphigs/errors/err.c b/src/libphigs/errors/err.c index 306a84c..2cf4e63 100644 --- a/src/libphigs/errors/err.c +++ b/src/libphigs/errors/err.c @@ -26,7 +26,7 @@ #include "err.h" #include "private/errP.h" -void (*phg_errhandle)() = perr_hand; +void (*phg_errhandle)(Pint, Pint, char *) = perr_hand; #define MSG_BUF_SIZE 255 @@ -254,8 +254,8 @@ void perr_log( */ void pset_err_hand( - void (*new_err_hand)(), - void (**old_err_hand)() + void (*new_err_hand)(int, int, char *), + void (**old_err_hand)(int, int, char *) ) { *old_err_hand = phg_errhandle; diff --git a/src/libphigs/ut/ut_htab.c b/src/libphigs/ut/ut_htab.c index 5f96c21..a093b89 100644 --- a/src/libphigs/ut/ut_htab.c +++ b/src/libphigs/ut/ut_htab.c @@ -141,7 +141,7 @@ Hash_table phg_htab_create( void phg_htab_destroy( Hash_table htab, - void (*destroy_entry)() + void (*destroy_entry)(int, caddr_t) ) { int i; diff --git a/src/libphigs/ws/wsb_lut.c b/src/libphigs/ws/wsb_lut.c index 945a7b7..3ff1f87 100644 --- a/src/libphigs/ws/wsb_lut.c +++ b/src/libphigs/ws/wsb_lut.c @@ -141,21 +141,21 @@ void phg_wsb_destroy_LUTs( Ws_output_ws *ows = &ws->out_ws; if (ows->htab.line) - phg_htab_destroy(ows->htab.line, (void(*)())NULL); + phg_htab_destroy(ows->htab.line, (void(*)(int, char *))NULL); if (ows->htab.marker) - phg_htab_destroy(ows->htab.marker, (void(*)())NULL); + phg_htab_destroy(ows->htab.marker, (void(*)(int, char *))NULL); if (ows->htab.text) - phg_htab_destroy(ows->htab.text, (void(*)())NULL); + phg_htab_destroy(ows->htab.text, (void(*)(int, char *))NULL); if (ows->htab.interior) - phg_htab_destroy(ows->htab.interior, (void(*)())NULL); + phg_htab_destroy(ows->htab.interior, (void(*)(int, char *))NULL); if (ows->htab.edge) - phg_htab_destroy(ows->htab.edge, (void(*)())NULL); + phg_htab_destroy(ows->htab.edge, (void(*)(int, char*))NULL); if (ows->htab.colour) - phg_htab_destroy(ows->htab.colour, (void(*)())NULL); + phg_htab_destroy(ows->htab.colour, (void(*)(int, char *))NULL); if (ows->htab.view) - phg_htab_destroy(ows->htab.view, (void(*)())NULL); + phg_htab_destroy(ows->htab.view, (void(*)(int, char *))NULL); if (ows->htab.light_source) - phg_htab_destroy(ows->htab.light_source, (void(*)())NULL); + phg_htab_destroy(ows->htab.light_source, (void(*)(int, char *))NULL); } /*******************************************************************************