From a0da2db47912322239c45091ec8184f204fa0441 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Mon, 5 Nov 2012 16:44:29 +0000 Subject: [PATCH] dtcalc: Resolve 43 warnings that would be introduced with -Wunused-variable or -Wall Basically 43 local variables declared in functions and then never used. --- cde/programs/dtcalc/calctool.c | 7 ++----- cde/programs/dtcalc/ds_xlib.c | 2 +- cde/programs/dtcalc/functions.c | 7 ++----- cde/programs/dtcalc/help.c | 1 - cde/programs/dtcalc/motif.c | 31 ++++++------------------------- 5 files changed, 11 insertions(+), 37 deletions(-) diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c index ce349764..edcfb069 100644 --- a/cde/programs/dtcalc/calctool.c +++ b/cde/programs/dtcalc/calctool.c @@ -378,7 +378,6 @@ int argc ; char **argv ; { char *ptr ; - int i ; v->progname = argv[0] ; /* Save programs name. */ v->appname = NULL ; @@ -476,7 +475,7 @@ int get_index(ch) char ch ; { - int n, val ; + int n ; for (n = 0; n < TITEMS; n++) { if (ch == buttons[n].value) @@ -1253,9 +1252,9 @@ int matherr(exc) /* Default math library exception handling routine. */ struct exception *exc ; { +#if 0 char msg[100]; -#if 0 if (exc) { strcpy(msg, exc->name); strcat(msg, ": "); @@ -1775,9 +1774,7 @@ void write_resources(filename) char *filename; { - char regval[5] ; char intval[5] ; - int i; int MPtemp[MP_SIZE]; SPRINTF(intval, "%d", v->accuracy) ; diff --git a/cde/programs/dtcalc/ds_xlib.c b/cde/programs/dtcalc/ds_xlib.c index fb7b0f4e..86b8af6f 100644 --- a/cde/programs/dtcalc/ds_xlib.c +++ b/cde/programs/dtcalc/ds_xlib.c @@ -94,7 +94,7 @@ char *appname ; /* Application name. */ char *resource ; /* X resource to search for. */ { char app[MAXLINE], res[MAXLINE] ; - char cstr[MAXLINE], nstr[MAXLINE], str[MAXLINE] ; + char cstr[MAXLINE], nstr[MAXLINE] ; char *str_type[20] ; XrmValue value ; diff --git a/cde/programs/dtcalc/functions.c b/cde/programs/dtcalc/functions.c index 341fb656..8c6ddaec 100644 --- a/cde/programs/dtcalc/functions.c +++ b/cde/programs/dtcalc/functions.c @@ -76,8 +76,6 @@ do_accuracy() /* Set display accuracy. */ void do_ascii() /* Convert ASCII value. */ { - int val ; - show_ascii_frame() ; } @@ -112,8 +110,7 @@ do_business() /* Perform special business mode calculations. */ Boolean need_show = TRUE; char *display_number = NULL; int MPbv[MP_SIZE], MP1[MP_SIZE], MP2[MP_SIZE], MP3[MP_SIZE], MP4[MP_SIZE] ; - int MP5[MP_SIZE]; - int i, len, val, val2, accSav ; + int i, len, val, accSav ; double result, w; if (IS_KEY(v->current, KEY_CTRM)) @@ -1166,7 +1163,7 @@ do_portion() void do_shift() /* Perform bitwise shift on display value. */ { - int i, MPtemp[MP_SIZE], shift ; + int MPtemp[MP_SIZE], shift ; BOOLEAN temp ; double dval ; diff --git a/cde/programs/dtcalc/help.c b/cde/programs/dtcalc/help.c index e8382c04..7c626647 100644 --- a/cde/programs/dtcalc/help.c +++ b/cde/programs/dtcalc/help.c @@ -442,7 +442,6 @@ GetHelpDialog() HelpStruct *pHelp; Arg args[5]; - int n; if(pHelpCache == (HelpStruct *)NULL) { diff --git a/cde/programs/dtcalc/motif.c b/cde/programs/dtcalc/motif.c index 67e02410..345a7360 100644 --- a/cde/programs/dtcalc/motif.c +++ b/cde/programs/dtcalc/motif.c @@ -278,9 +278,7 @@ main(argc, argv) int argc ; char **argv ; { - char bind_home[MAXPATHLEN], **new_environ ; Pixmap pixmap; - int i, j ; XtSetLanguageProc(NULL, NULL, NULL); _DtEnvControl(DT_ENV_SET); @@ -407,7 +405,6 @@ int row, column, maxrows, maxcols ; enum menu_type mtype = buttons[n].mtype ; Widget button ; XmString lstr ; - int result; Pixel bg; get_label(n) ; @@ -756,7 +753,7 @@ Widget owner ; static char *mnames[] = { "base", "ttype", "num", "hyp", "inv", "op", "mode" } ; int i, n, val; - Widget basePulldown, numPulldown, modePulldown, trigPulldown, dummyText; + Widget basePulldown, numPulldown, modePulldown, trigPulldown; Arg args[10]; XmString label_string; Pixel tmp_pixelbg, tmp_pixelfg; @@ -1591,9 +1588,7 @@ int row, column, inverted ; { char str[10] ; Widget widget ; - XmPushButtonWidget pb; int i, j, row2, column2; - static XtIntervalId timerId = 0; if(inverted) { @@ -2268,7 +2263,8 @@ int type; { char line[MAXLINE] ; /* Current memory register line. */ char *ptr, *tmp, *tmpStr; - int i, savAcc ; + int i; +/* int savAcc;*/ XmString str, numStr ; int MPtemp[MP_SIZE]; @@ -2614,7 +2610,7 @@ show_ascii_frame() /* Display ASCII popup. */ { int j; XmString tstr ; - Widget sep, frame, form; + Widget sep; Arg args[15]; XmString label_string; @@ -2991,8 +2987,6 @@ static void switch_mode(curmode) enum mode_type curmode ; { - int i ; - XmString lstr; Arg args[2]; v->modetype = curmode ; @@ -3349,7 +3343,7 @@ Widget widget ; XtPointer client_data, call_data ; { Arg args[1]; - int position, val, choice; + int val, choice; X->mtype = (enum menu_type) client_data ; XtSetArg (args[0], XmNuserData, &val); @@ -3371,17 +3365,15 @@ create_menu_bar(parent) Widget parent; { register int n; - int i, j, val, count; + int count; Widget WidgList[10]; Arg args[5]; char *mnemonic; XmString labelString; Widget child, mem_reg; Widget lastCascadeButtonGadget; - Widget lastCascadeButton; Widget lastMenuPane; Widget helpPulldown; - Widget lastCascadeMenuPane; /* Create the pulldown menu */ @@ -3673,7 +3665,6 @@ XtPointer call_data ; void read_resources() /* Read all possible resources from the database. */ { - int boolval, i, intval ; char str[MAXLINE] ; char *msg; @@ -3848,9 +3839,7 @@ XtPointer client_data, call_data ; create_popup(parent) Widget parent; { - int n; char *mnemonic; - Arg args[10]; XmString label; Widget dummyHelp1, dummyHelp2, memRegs; Widget help, helpI, helpToc, helpT, helpR, helpO, helpU, helpV; @@ -4200,7 +4189,6 @@ XtPointer call_data ; { char *full_path = NULL; char *file_name = NULL; - char *strPtr; char *sessionFileName; char **restart_argv = NULL; @@ -4272,7 +4260,6 @@ SaveSession( path, file_name ) char *path ; char *file_name ; { - char workspaceNumber[5]; int fd; Atom * ws_presence = NULL; char * workspace_name; @@ -4287,12 +4274,8 @@ SaveSession( path, file_name ) Position x, y; Dimension width, height; - char * command; - int command_len; - int i; int j; char * msg; - int view_index; char * tmpStr; XmVendorShellExtObject vendorExt; XmWidgetExtData extData; @@ -4399,11 +4382,9 @@ RestoreSession() Boolean status=False; char *path, *msg; char str[MAXLINE] ; - char temp[MAXLINE] ; char * full_path = NULL; XrmDatabase db; int boolval, i, intval ; - double result; int MPtemp[MP_SIZE]; status = DtSessionRestorePath(X->kframe, &full_path, -- 2.25.1