Skip to content

C-style fixings for modern compilers #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schwicke merged 1 commit into from
Sep 19, 2025
Merged

C-style fixings for modern compilers #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/include/phigs/css.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/include/phigs/err.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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 *)
);

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/include/phigs/util/htab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);

/*******************************************************************************
Expand Down
12 changes: 6 additions & 6 deletions src/libphigs/c_binding/cb_lite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/libphigs/css/css_el.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions src/libphigs/errors/err.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/libphigs/ut/ut_htab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions src/libphigs/ws/wsb_lut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*******************************************************************************
Expand Down