From f0123efa84c75055218ba57ef3ada78ed1df5c1e Mon Sep 17 00:00:00 2001 From: hyousatsu Date: Sat, 6 Jul 2024 09:42:25 +0000 Subject: [PATCH] Fix some warnings. --- cde/include/Dt/dproto.h | 10 +++---- cde/lib/DtSearch/boolyac.y | 3 +++ cde/lib/DtSearch/raima/crread.c | 2 +- cde/lib/DtSearch/raima/crwrite.c | 2 +- cde/lib/DtSearch/raima/fillnew.c | 2 +- cde/lib/DtSearch/raima/recread.c | 2 +- cde/lib/DtSearch/raima/recwrite.c | 2 +- cde/lib/DtTerm/TermPrim/TermPrim.c | 4 +-- cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c | 4 +-- .../dtappbuilder/src/ab/appfw_stubs.c | 2 +- .../dtappbuilder/src/ab/dnd_ed_stubs.c | 2 +- .../dtappbuilder/src/ab/message_ed_stubs.c | 2 +- .../dtappbuilder/src/ab/pal_panedwin.c | 2 +- .../dtappbuilder/src/libABil/bil_parse.y | 2 ++ cde/programs/dtcalc/calctool.c | 6 ++--- cde/programs/dtcalc/calctool.h | 1 + cde/programs/dtcalc/functions.c | 4 +-- cde/programs/dtcm/dtcm/browser.c | 2 +- cde/programs/dtcm/dtcm/rfp.c | 4 +-- cde/programs/dtcm/dtcm/x_graphics.c | 26 +++++++++---------- .../dthelp/parser/canon1/helptag/help.c | 2 -- .../dthelp/parser/canon1/helptag/help.if | 4 +-- .../dthelp/parser/canon1/helptag/option.c | 2 -- .../dthelp/parser/canon1/parser/proto.h | 4 +++ .../dthelp/parser/canon1/parser/scan.c | 2 -- .../dthelp/parser/pass1/helptag/help.c | 2 -- .../dthelp/parser/pass1/helptag/help.if | 4 +-- .../dthelp/parser/pass1/helptag/option.c | 2 -- .../dthelp/parser/pass1/parser/proto.h | 4 +++ .../dthelp/parser/pass1/parser/scan.c | 2 -- .../dthelp/parser/pass2/htag2/fproto.h | 2 +- .../dthelp/parser/pass2/htag2/option.c | 3 --- .../dthelp/parser/pass2/parser/parser.c | 16 ++++++------ .../dthelp/parser/pass2/parser/proto.h | 2 ++ .../dthelp/parser/pass2/parser/scan.c | 2 -- cde/programs/dtlogin/access.c | 12 ++++----- cde/programs/dtlogin/auth.c | 7 +++-- cde/programs/dtlogin/choose.c | 2 +- cde/programs/dtlogin/dm.h | 8 +++--- cde/programs/dtlogin/mitauth.c | 5 ++-- cde/programs/dtlogin/server.c | 2 +- cde/programs/dtlogin/xdmauth.c | 7 ++--- cde/programs/dtlogin/xdmcp.c | 8 +++--- cde/programs/ttsnoop/Makefile.am | 2 +- 44 files changed, 95 insertions(+), 95 deletions(-) diff --git a/cde/include/Dt/dproto.h b/cde/include/Dt/dproto.h index 2baa462f7..37f592a3a 100644 --- a/cde/include/Dt/dproto.h +++ b/cde/include/Dt/dproto.h @@ -189,10 +189,10 @@ int d_cmtype(int, int *, int); /* cmtype.c */ int d_connect(int, int); /* connect.c */ int d_cotype(int, int *, int); /* cotype.c */ int d_crget(DB_ADDR *, int); /* crget.c */ -int d_crread(long, char *, int); /* crread.c */ +int d_crread(long, void *, int); /* crread.c */ int d_crset(DB_ADDR *, int); /* crset.c */ int d_crtype(int *, int); /* crtype.c */ -int d_crwrite(long, char *, int); /* crwrite.c */ +int d_crwrite(long, void *, int); /* crwrite.c */ int d_csmget(int, DB_ADDR *, int); /* csmget.c */ int d_csmread(int, long, char *, int); /* csmread.c */ @@ -217,7 +217,7 @@ int d_recnext(int); /* recnext.c */ int d_recprev(int); /* recprev.c */ int d_destroy(const char *); /* destroy.c */ int d_discon(int, int); /* discon.c */ -int d_fillnew(int, const char *, int); /* fillnew.c */ +int d_fillnew(int, const void *, int); /* fillnew.c */ int d_findco(int, int); /* findco.c */ int d_findfm(int, int); /* findfm.c */ int d_findlm(int, int); /* findlm.c */ @@ -258,9 +258,9 @@ int d_reclast(int, int); /* reclast.c */ int d_reclock(int, char *, int); /* dblfcns.c */ int d_reclstat(int, char *, int); /* dblfcns.c */ int d_recover(const char *); /* recover.c */ -int d_recread(char *, int); /* recread.c */ +int d_recread(void *, int); /* recread.c */ int d_recset(int, int); /* recset.c */ -int d_recwrite(const char *, int); /* recwrite.c */ +int d_recwrite(const void *, int); /* recwrite.c */ int d_renfile(const char *dbn, FILE_NO fno, const char *fnm); /* renfile.c */ int d_retries(int); /* dblfcns.c */ int d_rlbclr(void); /* dblfcns.c */ diff --git a/cde/lib/DtSearch/boolyac.y b/cde/lib/DtSearch/boolyac.y index 8e3118d1f..8c7cf41df 100644 --- a/cde/lib/DtSearch/boolyac.y +++ b/cde/lib/DtSearch/boolyac.y @@ -41,6 +41,9 @@ */ #include #include "boolpars.h" + +void yyerror(char *); +int yylex(void); %} %union { diff --git a/cde/lib/DtSearch/raima/crread.c b/cde/lib/DtSearch/raima/crread.c index 59fcd9e7e..80ba29282 100644 --- a/cde/lib/DtSearch/raima/crread.c +++ b/cde/lib/DtSearch/raima/crread.c @@ -53,7 +53,7 @@ int d_crread( long field, /* Field constant */ -char *data, /* Data area to contain field contents */ +void *data, /* Data area to contain field contents */ int dbn /* database number */ ) { diff --git a/cde/lib/DtSearch/raima/crwrite.c b/cde/lib/DtSearch/raima/crwrite.c index 516b4e3ad..5bfe5f780 100644 --- a/cde/lib/DtSearch/raima/crwrite.c +++ b/cde/lib/DtSearch/raima/crwrite.c @@ -53,7 +53,7 @@ int d_crwrite( long field, /* field constant */ -char *data, /* data area to contain field contents */ +void *data, /* data area to contain field contents */ int dbn /* database number */ ) { diff --git a/cde/lib/DtSearch/raima/fillnew.c b/cde/lib/DtSearch/raima/fillnew.c index c52bb07cc..f7444944b 100644 --- a/cde/lib/DtSearch/raima/fillnew.c +++ b/cde/lib/DtSearch/raima/fillnew.c @@ -57,7 +57,7 @@ int d_fillnew( int nrec, /* record number */ -const char *recval, /* record value */ +const void *recval, /* record value */ int dbn /* database number */ ) { diff --git a/cde/lib/DtSearch/raima/recread.c b/cde/lib/DtSearch/raima/recread.c index 427a8731f..194806cfa 100644 --- a/cde/lib/DtSearch/raima/recread.c +++ b/cde/lib/DtSearch/raima/recread.c @@ -53,7 +53,7 @@ */ int d_recread( -char *rec, /* ptr to record area */ +void *rec, /* ptr to record area */ int dbn ) { diff --git a/cde/lib/DtSearch/raima/recwrite.c b/cde/lib/DtSearch/raima/recwrite.c index 34a092cf9..62bf8a1a9 100644 --- a/cde/lib/DtSearch/raima/recwrite.c +++ b/cde/lib/DtSearch/raima/recwrite.c @@ -53,7 +53,7 @@ */ int d_recwrite( -const char *rec, /* ptr to record area */ +const void *rec, /* ptr to record area */ int dbn ) { diff --git a/cde/lib/DtTerm/TermPrim/TermPrim.c b/cde/lib/DtTerm/TermPrim/TermPrim.c index ba225153f..2221afd3e 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrim.c +++ b/cde/lib/DtTerm/TermPrim/TermPrim.c @@ -1344,7 +1344,7 @@ Initialize(Widget ref_w, Widget w, Arg *args, Cardinal *num_args) tw->term.log_on = False ; if (tw->term.logging) { - _DtTermPrimStartLog(tw) ; + _DtTermPrimStartLog((Widget) tw); } Debug('T', timeStamp("TermPrim Initialize() finished")); @@ -2675,7 +2675,7 @@ Destroy(Widget w) /* flush the log file */ if (tw->term.logging ) { - _DtTermPrimCloseLog(tw) ; + _DtTermPrimCloseLog((Widget) tw); } if (tw->term.boldFont) { diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c index 6beafd0c1..1c0c9c73e 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c @@ -621,7 +621,7 @@ DoInsertWc(Widget w, wchar_t *wcBuffer, int wcBufferLen, Boolean *wrapped) wcBuffer, /* newChars */ wcBufferLen, /* numChars */ tpd->insertCharMode != DtTERM_INSERT_CHAR_OFF, /* insert flag */ - &returnChars, /* return char ptr */ + (termChar **) (&returnChars), /* return char ptr */ &returnCount); /* return count ptr */ if ((tpd->insertCharMode != DtTERM_INSERT_CHAR_ON_WRAP) || (returnCount <= 0)) { @@ -659,7 +659,7 @@ DoInsertWc(Widget w, wchar_t *wcBuffer, int wcBufferLen, Boolean *wrapped) wcBuffer, /* newChars */ wcBufferLen, /* numChars */ tpd->insertCharMode != DtTERM_INSERT_CHAR_OFF, /* insert flag */ - &returnChars, /* return char ptr */ + (termChar **) (&returnChars), /* return char ptr */ &returnCount); /* return count ptr */ (void) XtFree((char *) wcBuffer); (void) XtFree((char *) returnChars); diff --git a/cde/programs/dtappbuilder/src/ab/appfw_stubs.c b/cde/programs/dtappbuilder/src/ab/appfw_stubs.c index 15dfbc737..6856a6529 100644 --- a/cde/programs/dtappbuilder/src/ab/appfw_stubs.c +++ b/cde/programs/dtappbuilder/src/ab/appfw_stubs.c @@ -166,7 +166,7 @@ appfw_editor_init( ) { Widget item[10]; - int item_val[10]; + XtArgVal item_val[10]; int n; /* diff --git a/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c index e5c52fba3..ddf995a8d 100644 --- a/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c +++ b/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c @@ -210,7 +210,7 @@ dnd_ed_editor_init( { DndEditorSettings dds = &dndEdInfo; Widget item[10]; - int item_val[10]; + XtArgVal item_val[10]; int n = 0; /* diff --git a/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c index 7840fa960..778c53f1d 100644 --- a/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c +++ b/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c @@ -360,7 +360,7 @@ msg_editor_init( { MsgEditorSettingsRec *mes = &msg_editor_settings_rec; Widget item[6]; - int item_val[6]; + XtArgVal item_val[6]; int i, n; /* diff --git a/cde/programs/dtappbuilder/src/ab/pal_panedwin.c b/cde/programs/dtappbuilder/src/ab/pal_panedwin.c index 17d72820c..c40bdb950 100644 --- a/cde/programs/dtappbuilder/src/ab/pal_panedwin.c +++ b/cde/programs/dtappbuilder/src/ab/pal_panedwin.c @@ -218,7 +218,7 @@ panedwin_prop_init( DtbRevolvPropDialogInfo rpd = &(dtb_revolv_prop_dialog); PropPanedWinSettingsRec *pws = &(prop_pw_settings_rec[type]); Widget item[2]; - int item_val[2]; + XtArgVal item_val[2]; int n = 0; if (type == AB_PROP_REVOLVING) diff --git a/cde/programs/dtappbuilder/src/libABil/bil_parse.y b/cde/programs/dtappbuilder/src/libABil/bil_parse.y index 6856554ef..55aefb6bc 100644 --- a/cde/programs/dtappbuilder/src/libABil/bil_parse.y +++ b/cde/programs/dtappbuilder/src/libABil/bil_parse.y @@ -25,6 +25,8 @@ #define TOK (bilP_load_get_token()) +void yyerror(char *); +int yylex(void); %} /* * We assume that yacc spits out the symbols in the order they are diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c index 279582000..756e728a4 100644 --- a/cde/programs/dtcalc/calctool.c +++ b/cde/programs/dtcalc/calctool.c @@ -46,7 +46,6 @@ #include "patchlevel.h" #include "calctool.h" #include "ds_common.h" -#include "calctool.h" #include "text.h" static double max_fix[4] = { @@ -1203,8 +1202,8 @@ make_number(int *MPnumber, BOOLEAN mkFix) /*ARGSUSED*/ /* Default math library exception handling routine. */ -int -matherr(struct exception *exc) +void +math_err(void) { #if 0 char msg[100]; @@ -1232,7 +1231,6 @@ matherr(struct exception *exc) #endif doerr(vstrs[(int) V_ERROR]) ; - return(1) ; /* Value ignored. */ } /* Convert string into an MP number. */ diff --git a/cde/programs/dtcalc/calctool.h b/cde/programs/dtcalc/calctool.h index e5b7fa66d..a6b631562 100644 --- a/cde/programs/dtcalc/calctool.h +++ b/cde/programs/dtcalc/calctool.h @@ -636,6 +636,7 @@ void make_items(void); void make_modewin(void); void make_fin_registers(void); void make_registers(int); +void math_err(void); void MPstr_to_num(char *, enum base_type, int *); void paren_disp(char); void process_event(int); diff --git a/cde/programs/dtcalc/functions.c b/cde/programs/dtcalc/functions.c index fa96fe484..8bcaaf618 100644 --- a/cde/programs/dtcalc/functions.c +++ b/cde/programs/dtcalc/functions.c @@ -677,7 +677,7 @@ do_factorial(int *MPval, int *MPres) /* Calculate the factorial of MPval. */ } mpcim(&i, MPa) ; mpcmi(MP1, &i) ; - if (!i) matherr((struct exception *) NULL) ; + if (!i) math_err() ; else while (i > 0) { @@ -687,7 +687,7 @@ do_factorial(int *MPval, int *MPres) /* Calculate the factorial of MPval. */ i-- ; } } - else matherr((struct exception *) NULL) ; + else math_err() ; mpstr(MPa, MPres) ; } diff --git a/cde/programs/dtcm/dtcm/browser.c b/cde/programs/dtcm/dtcm/browser.c index 8de446cd8..09f948986 100644 --- a/cde/programs/dtcm/dtcm/browser.c +++ b/cde/programs/dtcm/dtcm/browser.c @@ -1323,7 +1323,7 @@ mb_clear_selected_calendar( if (geditor_showing(e)) remove_from_gaccess_list(name, e); mb_deregister_names(name, c); - mb_refresh_canvas(c->browser, c); + mb_refresh_canvas(b, c); } extern void diff --git a/cde/programs/dtcm/dtcm/rfp.c b/cde/programs/dtcm/dtcm/rfp.c index 460aee2d9..5c9319976 100644 --- a/cde/programs/dtcm/dtcm/rfp.c +++ b/cde/programs/dtcm/dtcm/rfp.c @@ -942,7 +942,7 @@ rfp_form_flags_to_appt(RFP *rfp, Dtcm_appointment *a, char *name, int *flagsP) memset(a->repeat_type, 0, sizeof(CSA_attribute)); _DtCm_set_sint32_attrval(rfp->repeat_type, - &a->repeat_type->value); + (cms_attribute_value **) &a->repeat_type->value); } else a->repeat_type->value->item.sint32_value = rfp->repeat_type; } @@ -958,7 +958,7 @@ rfp_form_flags_to_appt(RFP *rfp, Dtcm_appointment *a, char *name, int *flagsP) memset(a->repeat_type, 0, sizeof(CSA_attribute)); - _DtCm_set_sint32_attrval(rfp->repeat_type,&a->repeat_type->value); + _DtCm_set_sint32_attrval(rfp->repeat_type, (cms_attribute_value **) &a->repeat_type->value); } else a->repeat_type->value->item.sint32_value = rfp->repeat_type; } diff --git a/cde/programs/dtcm/dtcm/x_graphics.c b/cde/programs/dtcm/dtcm/x_graphics.c index 7233d3c67..bfe295516 100644 --- a/cde/programs/dtcm/dtcm/x_graphics.c +++ b/cde/programs/dtcm/dtcm/x_graphics.c @@ -1351,7 +1351,7 @@ cm_print_appt_text(CMGraphicsInfo *gInfo, char *str, unsigned long _len; _len = strlen(str); - _converter_( str, _len, &to, &to_len ); + _converter_( str, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) str = to; @@ -1578,7 +1578,7 @@ cm_print_todo_text(CMGraphicsInfo *gInfo, char *str1, CSA_sint32 as, unsigned long _len; _len = strlen(str1); - _converter_( str1, _len, &to, &to_len ); + _converter_( str1, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) str1 = to; } @@ -2009,7 +2009,7 @@ local_dayname(Calendar *c, char **array_place, int dayNum) dayCatIndex[dayNum], defaultDays[dayNum]); _len = strlen( source ); - _converter_( source, _len, &to, &to_len ); + _converter_( source, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { str = euc_to_octal(to); } else { @@ -2041,7 +2041,7 @@ local_dayname3(Calendar *c, char **array_place, int dayNum) dayCatIndex[dayNum], defaultDays[dayNum]); _len = strlen( source ); - _converter_( source, _len, &to, &to_len ); + _converter_( source, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { str = euc_to_octal(to); } else { @@ -2089,7 +2089,7 @@ get_report_type_string(CMGraphicsInfo *gInfo) defaultStrs[reportType]); _len = strlen( str ); - _converter_( str, _len, &to, &to_len ); + _converter_( str, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { str = to; } @@ -2367,7 +2367,7 @@ x_open_file(Calendar *c) unsigned long _len; _len = strlen( gInfo->timestamp ); - _converter_( gInfo->timestamp, _len, &to, &to_len ); + _converter_( gInfo->timestamp, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) strncpy( gInfo->timestamp, to, ( BUFFERSIZE > to_len ) ? to_len : BUFFERSIZE - 1 ); @@ -2610,7 +2610,7 @@ x_print_header(void *gInfoP, char *buf, int pageNum, int numPages) unsigned long _len; _len = strlen( buf ); - _converter_( buf, _len, &to, &to_len ); + _converter_( buf, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { str = euc_to_octal(to); } else { @@ -2639,7 +2639,7 @@ x_print_header(void *gInfoP, char *buf, int pageNum, int numPages) unsigned long _len; _len = strlen( str2 ); - _converter_( str2, _len, &to, &to_len ); + _converter_( str2, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { strncpy( str2, to, ( BUFFERSIZE > to_len ) ? to_len : BUFFERSIZE ); @@ -2654,7 +2654,7 @@ x_print_header(void *gInfoP, char *buf, int pageNum, int numPages) unsigned long _len; _len = strlen( str ); - _converter_( str, _len, &to, &to_len ); + _converter_( str, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { str = to; } @@ -2717,7 +2717,7 @@ x_day_header (void *gInfoP) unsigned long _len; _len = strlen( str ); - _converter_( str, _len, &to, &to_len ); + _converter_( str, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { str = to; } @@ -2737,7 +2737,7 @@ x_day_header (void *gInfoP) unsigned long _len; _len = strlen( str ); - _converter_( str, _len, &to, &to_len ); + _converter_( str, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { str = to; } @@ -3249,7 +3249,7 @@ x_print_month(void *gInfoP, int mon, int yr, int x1, unsigned long _len; _len = strlen(str); - _converter_( str, _len, &to, &to_len ); + _converter_( str, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { cm_strcpy(str, to); } @@ -3574,7 +3574,7 @@ x_week_daynames(void *gInfoP, char *dayName, int dayIndex, Boolean more) unsigned long _len; _len = strlen(dayName); - _converter_( dayName, _len, &to, &to_len ); + _converter_( dayName, _len, (void **) &to, &to_len ); if ( ( to != NULL ) && ( to_len != 0 ) ) { dayName = to; } diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c index 4479c1619..8e3a68628 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.c +++ b/cde/programs/dthelp/parser/canon1/helptag/help.c @@ -29,8 +29,6 @@ #include "userinc.h" #include "globdec.h" -void m_mberr1(char *text, const char *arg); - void assert_hometopic_exists(void) { static const char hometopic[] = "-HOMETOPIC"; diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.if b/cde/programs/dthelp/parser/canon1/helptag/help.if index 1e31834b0..7241d124f 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.if +++ b/cde/programs/dthelp/parser/canon1/helptag/help.if @@ -165,8 +165,8 @@ m_free(wc_2,"wide character string"); } #else - m_piaction("UNDEFINED MACHINE", - "m-machine", + m_piaction((M_WCHAR *) "UNDEFINED MACHINE", + (M_WCHAR *) "m-machine", M_SDATA) ; #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/option.c b/cde/programs/dthelp/parser/canon1/helptag/option.c index 513c512b4..a0382d66a 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/option.c +++ b/cde/programs/dthelp/parser/canon1/helptag/option.c @@ -37,8 +37,6 @@ #define TAGDOTOPT "helptag.opt" #define DOTOPT ".opt" -void m_mberr1(char *text, const char *arg); - void options(LOGICAL filelenonly) { int i; diff --git a/cde/programs/dthelp/parser/canon1/parser/proto.h b/cde/programs/dthelp/parser/canon1/parser/proto.h index e9acf1926..9f2900e2c 100644 --- a/cde/programs/dthelp/parser/canon1/parser/proto.h +++ b/cde/programs/dthelp/parser/canon1/parser/proto.h @@ -21,6 +21,8 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 09:42:21 rswiston $ */ +void chksnb(void); + int m_actgetc(void); void m_adjuststate(void); @@ -31,6 +33,8 @@ void m_attval(M_WCHAR *string); LOGICAL m_attvonly(M_WCHAR *string); +void m_mberr1(const char *text, const char *arg); + int m_checkstart(M_ELEMENT val); LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet); diff --git a/cde/programs/dthelp/parser/canon1/parser/scan.c b/cde/programs/dthelp/parser/canon1/parser/scan.c index 7c08595f8..19c988d51 100644 --- a/cde/programs/dthelp/parser/canon1/parser/scan.c +++ b/cde/programs/dthelp/parser/canon1/parser/scan.c @@ -47,8 +47,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "entity2.h" #include "sref.h" -void m_mberr1(char *text, const char *arg); - /* Actually read a character from an input stream */ int m_actgetc(void) { diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.c b/cde/programs/dthelp/parser/pass1/helptag/help.c index 48c43af5d..6af835d4c 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.c +++ b/cde/programs/dthelp/parser/pass1/helptag/help.c @@ -30,8 +30,6 @@ #include "globdec.h" #include "proto.h" -void m_mberr1(char *text, const char *arg); - void assert_hometopic_exists(void) { static const char hometopic[] = "-HOMETOPIC"; diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.if b/cde/programs/dthelp/parser/pass1/helptag/help.if index 78d7d0c77..b48523096 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.if +++ b/cde/programs/dthelp/parser/pass1/helptag/help.if @@ -154,8 +154,8 @@ m_free(wc_2,"wide character string"); } #else - m_piaction("UNDEFINED MACHINE", - "m-machine", + m_piaction((M_WCHAR *) "UNDEFINED MACHINE", + (M_WCHAR *) "m-machine", M_SDATA) ; #endif <\CODE> diff --git a/cde/programs/dthelp/parser/pass1/helptag/option.c b/cde/programs/dthelp/parser/pass1/helptag/option.c index 87eac3397..260c29409 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/option.c +++ b/cde/programs/dthelp/parser/pass1/helptag/option.c @@ -26,8 +26,6 @@ #include "userinc.h" #include "globdec.h" -void m_mberr1(char *text, const char *arg); - #if defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include diff --git a/cde/programs/dthelp/parser/pass1/parser/proto.h b/cde/programs/dthelp/parser/pass1/parser/proto.h index 690b12479..3d6908859 100644 --- a/cde/programs/dthelp/parser/pass1/parser/proto.h +++ b/cde/programs/dthelp/parser/pass1/parser/proto.h @@ -21,6 +21,8 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 10:24:42 rswiston $ */ +void chksnb(void); + int m_actgetc(void); void m_adjuststate(void); @@ -172,6 +174,8 @@ int main(int argc, char **argv); void *m_malloc(int size, char *msg); +void m_mberr1(const char *text, const char *arg); + void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start); LOGICAL m_nextand(M_OPENFSA *thisfsa, M_ELEMENT label); diff --git a/cde/programs/dthelp/parser/pass1/parser/scan.c b/cde/programs/dthelp/parser/pass1/parser/scan.c index 5cb04e6b4..bc20a3b73 100644 --- a/cde/programs/dthelp/parser/pass1/parser/scan.c +++ b/cde/programs/dthelp/parser/pass1/parser/scan.c @@ -47,8 +47,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "entity2.h" #include "sref.h" -void m_mberr1(char *text, const char *arg); - /* Actually read a character from an input stream */ int m_actgetc(void) { diff --git a/cde/programs/dthelp/parser/pass2/htag2/fproto.h b/cde/programs/dthelp/parser/pass2/htag2/fproto.h index 8633db31b..63994de82 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/fproto.h +++ b/cde/programs/dthelp/parser/pass2/htag2/fproto.h @@ -54,7 +54,7 @@ void OpenTag(LOGICAL hasAttributes, void CloseTag(LOGICAL newlineOK); -void ImpliedlAttribute(char *name, +void ImpliedAttribute(char *name, M_WCHAR *value); void RequiredAttribute(char *name, diff --git a/cde/programs/dthelp/parser/pass2/htag2/option.c b/cde/programs/dthelp/parser/pass2/htag2/option.c index b6e33f45c..b47be68bc 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/option.c +++ b/cde/programs/dthelp/parser/pass2/htag2/option.c @@ -31,9 +31,6 @@ #include #endif -void m_mberr1(char *text, const char *arg); - - /* Interpret options from command line and specified files */ #define OPTLEN 512 /* If OPTLEN changes, change fscanf call below */ #define TAGDOTOPT "helptag.opt" diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.c b/cde/programs/dthelp/parser/pass2/parser/parser.c index 65277caa8..dce00f751 100644 --- a/cde/programs/dthelp/parser/pass2/parser/parser.c +++ b/cde/programs/dthelp/parser/pass2/parser/parser.c @@ -72,8 +72,8 @@ void main(int argc, char **argv) if (! m_curcon) { if (m_token != M_ENDFILE) { m_error("Parsing table error") ; - sprintf(buffer, parserr, m_token, m_prevcon, m_scanval) ; - m_errline(buffer) ; + sprintf((char *) buffer, parserr, m_token, m_prevcon, m_scanval) ; + m_errline((char *) buffer) ; } else { m_error("Unexpected end of document") ; @@ -92,17 +92,17 @@ void main(int argc, char **argv) m_aftereod = TRUE ; } if (m_scantrace) { - sprintf(buffer, sopt, + sprintf((char *) buffer, sopt, m_prevcon, m_token, m_curcon, m_scanval ? m_scanval : ' ', m_scanval, m_line[m_sysecnt], m_netlevel) ; - m_trace(buffer) ; + m_trace((char *) buffer) ; if (m_token == M_NAME) { - sprintf(buffer, name, m_name) ; - m_trace(buffer) ; + sprintf((char *) buffer, name, m_name) ; + m_trace((char *) buffer) ; } if (m_token == M_LITERAL) { - sprintf(buffer, literal, m_literal) ; - m_trace(buffer) ; + sprintf((char *) buffer, literal, m_literal) ; + m_trace((char *) buffer) ; } } #include "case.c" diff --git a/cde/programs/dthelp/parser/pass2/parser/proto.h b/cde/programs/dthelp/parser/pass2/parser/proto.h index 2e0f0371b..3755b762b 100644 --- a/cde/programs/dthelp/parser/pass2/parser/proto.h +++ b/cde/programs/dthelp/parser/pass2/parser/proto.h @@ -172,6 +172,8 @@ void main(int argc, char **argv); void *m_malloc(int size, char *msg); +void m_mberr1(const char *text, const char *arg); + void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start); LOGICAL m_nextand(M_OPENFSA *thisfsa, M_ELEMENT label); diff --git a/cde/programs/dthelp/parser/pass2/parser/scan.c b/cde/programs/dthelp/parser/pass2/parser/scan.c index add43bde2..3bc16ced8 100644 --- a/cde/programs/dthelp/parser/pass2/parser/scan.c +++ b/cde/programs/dthelp/parser/pass2/parser/scan.c @@ -47,8 +47,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "entity2.h" #include "sref.h" -void m_mberr1(char *text, const char *arg); - /* Actually read a character from an input stream */ int m_actgetc(void) { diff --git a/cde/programs/dtlogin/access.c b/cde/programs/dtlogin/access.c index 03676974a..f1dc26d77 100644 --- a/cde/programs/dtlogin/access.c +++ b/cde/programs/dtlogin/access.c @@ -147,7 +147,7 @@ static int scanHostlist( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure, int depth, int broadcast) ; @@ -162,7 +162,7 @@ static int indirectAlias( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure, int depth, int broadcast) ; @@ -625,7 +625,7 @@ scanHostlist( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure, int depth, int broadcast ) @@ -675,7 +675,7 @@ indirectAlias( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure, int depth, int broadcast ) @@ -709,7 +709,7 @@ ForEachMatchingIndirectHost( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(CARD16, struct _ARRAY8 *, char *), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure ) { int haveLocalhost = 0; @@ -828,7 +828,7 @@ ForEachChooserHost( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure ) { int haveLocalhost = 0; diff --git a/cde/programs/dtlogin/auth.c b/cde/programs/dtlogin/auth.c index ebbe51598..333be04ff 100644 --- a/cde/programs/dtlogin/auth.c +++ b/cde/programs/dtlogin/auth.c @@ -152,7 +152,7 @@ struct AuthProtocol { unsigned short name_length; char *name; - int (*InitAuth)( + void (*InitAuth)( #if NeedWidePrototypes unsigned int name_len, #else @@ -168,7 +168,10 @@ struct AuthProtocol { #endif /* NeedWidePrototypes */ char *name) ; - void (*GetXdmcpAuth)(); + void (*GetXdmcpAuth)( + struct protoDisplay *pdpy, + unsigned short authorizationNameLen, + char *authorizationName); int inited; }; diff --git a/cde/programs/dtlogin/choose.c b/cde/programs/dtlogin/choose.c index 57ac9219e..8d1299e4f 100644 --- a/cde/programs/dtlogin/choose.c +++ b/cde/programs/dtlogin/choose.c @@ -428,7 +428,7 @@ RunChooser ( args = parseArgs (args, buf); ForEachChooserHost (&d->clientAddr, d->connectionType, - (int (*)()) AddChooserHost, + AddChooserHost, (char *) &args); env = systemEnv (d, (char *) 0, (char *) 0); if (d->authFile) diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h index 57cc1b5a5..345c56cb1 100644 --- a/cde/programs/dtlogin/dm.h +++ b/cde/programs/dtlogin/dm.h @@ -314,7 +314,7 @@ struct display { /* XDMCP state */ CARD32 sessionID; /* ID of active session */ - struct sockaddr *peer; /* sockaddr of display peer */ + XdmcpNetaddr peer; /* sockaddr of display peer */ int peerlen; /* length of peer name */ struct sockaddr *from; /* XDMCP port of display */ int fromlen; @@ -519,7 +519,7 @@ extern void ForEachChooserHost( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure) ; extern int ForEachMatchingIndirectHost( ARRAY8Ptr clientAddress, @@ -528,7 +528,7 @@ extern int ForEachMatchingIndirectHost( #else CARD16 connectionType, #endif /* NeedWidePrototypes */ - int (*function)(CARD16, struct _ARRAY8 *, char *), + void (*function)(CARD16, struct _ARRAY8 *, char *), char *closure) ; extern int ScanAccessDatabase( void ) ; extern int UseChooser( @@ -703,7 +703,7 @@ extern Xauth * MitGetAuth( #endif /* NeedWidePrototypes */ char *name) ; -extern int MitInitAuth( +extern void MitInitAuth( #if NeedWidePrototypes unsigned int name_len, #else diff --git a/cde/programs/dtlogin/mitauth.c b/cde/programs/dtlogin/mitauth.c index 264d9ea31..6acb31dc0 100644 --- a/cde/programs/dtlogin/mitauth.c +++ b/cde/programs/dtlogin/mitauth.c @@ -95,16 +95,15 @@ static int auth_name_len; void GenerateAuthData (char *auth, int len); // genauth.c #if NeedWidePrototypes -int MitInitAuth (unsigned int name_len, char *name) +void MitInitAuth (unsigned int name_len, char *name) #else -int MitInitAuth (unsigned short name_len, char *name) +void MitInitAuth (unsigned short name_len, char *name) #endif /* NeedWidePrototypes */ { if (name_len > 256) name_len = 256; auth_name_len = name_len; memmove( auth_name, name, name_len); - return(0); } #if NeedWidePrototypes diff --git a/cde/programs/dtlogin/server.c b/cde/programs/dtlogin/server.c index f88deec90..1853f070b 100644 --- a/cde/programs/dtlogin/server.c +++ b/cde/programs/dtlogin/server.c @@ -333,7 +333,7 @@ GetRemoteAddress( struct display *d, int fd ) d->peerlen = 0; if (len) { - d->peer = (struct sockaddr *) malloc (len); + d->peer = malloc (len); if (d->peer) { bcopy (buf, (char *) d->peer, len); diff --git a/cde/programs/dtlogin/xdmauth.c b/cde/programs/dtlogin/xdmauth.c index d809dc944..c3d7bb5df 100644 --- a/cde/programs/dtlogin/xdmauth.c +++ b/cde/programs/dtlogin/xdmauth.c @@ -239,7 +239,8 @@ void XdmGetXdmcpAuth (struct protoDisplay *pdpy, unsigned short authorizationNam XdmPrintDataHex ("Accept packet auth", xdmcpauth->data, xdmcpauth->data_length); XdmPrintDataHex ("Auth file auth", fileauth->data, fileauth->data_length); /* encrypt the session key for its trip back to the server */ - XdmcpWrap (xdmcpauth->data, &pdpy->key, xdmcpauth->data, 8); + XdmcpWrap ((unsigned char *)xdmcpauth->data, (unsigned char *)&pdpy->key, + (unsigned char *)xdmcpauth->data, 8); pdpy->fileAuthorization = fileauth; pdpy->xdmcpAuthorization = xdmcpauth; } @@ -326,14 +327,14 @@ int XdmCheckAuthentication (struct protoDisplay *pdpy, ARRAY8Ptr displayID, return FALSE; if (authenticationData->length != 8) return FALSE; - XdmcpUnwrap (authenticationData->data, &pdpy->key, + XdmcpUnwrap (authenticationData->data, (unsigned char *)&pdpy->key, authenticationData->data, 8); XdmPrintArray8Hex ("Request packet auth", authenticationData); if (!XdmcpCopyARRAY8(authenticationData, &pdpy->authenticationData)) return FALSE; incoming = (XdmAuthKeyPtr) authenticationData->data; XdmcpIncrementKey (incoming); - XdmcpWrap (authenticationData->data, &pdpy->key, + XdmcpWrap (authenticationData->data, (unsigned char *)&pdpy->key, authenticationData->data, 8); return TRUE; } diff --git a/cde/programs/dtlogin/xdmcp.c b/cde/programs/dtlogin/xdmcp.c index 84b489df9..bc055155a 100644 --- a/cde/programs/dtlogin/xdmcp.c +++ b/cde/programs/dtlogin/xdmcp.c @@ -175,7 +175,7 @@ AnyWellKnownSockets (void) static XdmcpBuffer buffer; /*ARGSUSED*/ -static int +static void sendForward (CARD16 connectionType, ARRAY8Ptr address, char *closure) { #ifdef AF_INET @@ -198,7 +198,7 @@ sendForward (CARD16 connectionType, ARRAY8Ptr address, char *closure) in_addr.sin_family = AF_INET; in_addr.sin_port = htons ((short) XDM_UDP_PORT); if (address->length != 4) - return 0; + return; memmove( (char *) &in_addr.sin_addr, address->data, address->length); addrlen = sizeof (struct sockaddr_in); break; @@ -207,10 +207,10 @@ sendForward (CARD16 connectionType, ARRAY8Ptr address, char *closure) case FamilyDECnet: #endif default: - return 0; + return; } XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)addr, addrlen); - return 0; + return; } extern char *NetaddrAddress(); diff --git a/cde/programs/ttsnoop/Makefile.am b/cde/programs/ttsnoop/Makefile.am index 7448c2223..3783388de 100644 --- a/cde/programs/ttsnoop/Makefile.am +++ b/cde/programs/ttsnoop/Makefile.am @@ -167,7 +167,7 @@ ttsnoop.C ttsnoop.h dtb_utils.c dtb_utils.h: ttsnoop.bip ttsnoop.C.src $(SED) \ -e 's/\(MoreButton;\)/\1Boolean _DtCanHelp( const char * );/' \ -e 's/\(XtManageChild(Quick_help\)/XtSetSensitive(MoreButton,_DtCanHelp(help_data->help_text));\1/' \ - -e 's/\(buffer, vol, loc;\)/\1Boolean _DtHelped( Widget );/' \ + -e 's/\(buffer, vol = NULL, loc = NULL;\)/\1Boolean _DtHelped( Widget );/' \ -e 's/\(if( (cp=strrchr\)/if (_DtHelped( help_dialog)) return;\1/' \ dtb_utils.c > dtb_utils.c.patched mv dtb_utils.c.patched dtb_utils.c