From fa4fe1fb479db99f0c3d8acdf7aeec70b713e96f Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Tue, 21 Dec 2021 01:11:29 +0000 Subject: [PATCH] libdtterm: Resolve uninitialized warnings --- cde/lib/DtTerm/Term/TermBuffer.c | 4 ++-- cde/lib/DtTerm/Term/TermParse.c | 5 +++++ cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c | 4 ++-- cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c | 4 ++-- cde/lib/DtTerm/TermPrim/TermPrimSubproc.c | 2 +- cde/lib/DtTerm/TermView/TermViewMenu.c | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cde/lib/DtTerm/Term/TermBuffer.c b/cde/lib/DtTerm/Term/TermBuffer.c index 238e18bd1..5325b9f5e 100644 --- a/cde/lib/DtTerm/Term/TermBuffer.c +++ b/cde/lib/DtTerm/Term/TermBuffer.c @@ -984,8 +984,8 @@ _DtTermBufferErase DtEraseMode eraseSwitch ) { - short startCol; - short lastCol; + short startCol = 0; + short lastCol = 0; switch(eraseSwitch) { diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c index d41035d11..9750ecca6 100644 --- a/cde/lib/DtTerm/Term/TermParse.c +++ b/cde/lib/DtTerm/Term/TermParse.c @@ -529,6 +529,8 @@ _DtTermEraseDisplay(Widget w) /* ED CSIpJ */ case 2: eraseMode = eraseBuffer; break ; + default: + return; } _DtTermFuncEraseInDisplay(w, (int)eraseMode, fromParser); vtw->term.tpd->cursorRow = row; @@ -746,6 +748,9 @@ _DtTermEraseInLine(Widget w) /* EL ESC[pK */ eraseMode = eraseLine; break; + default: + return; + } _DtTermFuncEraseInLine(w, (int)eraseMode, fromParser); } diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c index a29bcd0ad..f645cf685 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c @@ -573,8 +573,8 @@ _DtTermPrimBufferInsertWc short *returnLength /* count of characters in overflow buffer */ ) { - short widthInc; /* incremental change in line width */ - short lengthInc; /* incremental change in line length */ + short widthInc = 0; /* incremental change in line width */ + short lengthInc = 0; /* incremental change in line length */ short widthInsert; /* column width of chars inserted */ short localCol; TermLine line; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c index ece7959e8..26f51edf0 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c @@ -68,8 +68,8 @@ _DtTermPrimRefreshTextWc(Widget w, short startColumn, short startRow, short chunkStartColumn; short chunkWidth; short chunkLength; - short thisStartColumn; - short thisEndColumn; + short thisStartColumn = 0; + short thisEndColumn = 0; enhValues enhancements; int i1; int lineNum; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c index c61d472df..da6f2b824 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c @@ -282,7 +282,7 @@ _DtTermPrimSubprocExec(Widget w, DtTermPrimitiveWidget tw = (DtTermPrimitiveWidget) w; static char *defaultCmd = (char *) 0; int i; - int pty; + int pty = -1; pid_t pid; char *c; int err; diff --git a/cde/lib/DtTerm/TermView/TermViewMenu.c b/cde/lib/DtTerm/TermView/TermViewMenu.c index 0ad1437c1..753c536ea 100644 --- a/cde/lib/DtTerm/TermView/TermViewMenu.c +++ b/cde/lib/DtTerm/TermView/TermViewMenu.c @@ -599,7 +599,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar, Arg arglist[20]; Arg *newArglist; int i; - KeySym ks; + KeySym ks = NoSymbol; char *accelerator; char *acceleratorText;