From c5a5fcea941e4ee7c4c68ae090601d6282f0a5cb Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 28 Feb 2023 16:10:19 -0800 Subject: Variable scope reductions as suggested by cppcheck Signed-off-by: Alan Coopersmith --- src/Actions.c | 43 +++++++++++++++----------------- src/AsciiSink.c | 19 ++++++++------- src/AsciiSrc.c | 28 ++++++++++----------- src/Box.c | 21 ++++++++-------- src/Command.c | 3 +-- src/Dialog.c | 8 +++--- src/DisplayList.c | 41 ++++++++++++------------------- src/Form.c | 12 ++++----- src/Label.c | 5 ++-- src/List.c | 5 ++-- src/MultiSink.c | 3 ++- src/MultiSrc.c | 10 +++----- src/Paned.c | 6 +++-- src/Pixmap.c | 10 ++++---- src/SimpleMenu.c | 13 +++++----- src/StripChart.c | 7 +++--- src/Text.c | 73 ++++++++++++++++++++++++++++++++----------------------- src/TextAction.c | 21 ++++++++++------ src/TextSrc.c | 17 ++++++------- src/Toggle.c | 5 ++-- src/Tree.c | 35 ++++++++++++-------------- 21 files changed, 190 insertions(+), 195 deletions(-) diff --git a/src/Actions.c b/src/Actions.c index ae330d5..3dd2d78 100644 --- a/src/Actions.c +++ b/src/Actions.c @@ -151,15 +151,16 @@ static Cardinal num_variable_list; Bool XawParseBoolean(Widget w, String param, XEvent *event, Bool *succeed) { - char *tmp = (char *)param; - int value; - if (!param) return (False); + else + { + char *tmp = (char *)param; + int value = (int) strtod(param, &tmp); - value = (int)strtod(param, &tmp); - if (*tmp == '\0') - return (value); + if (*tmp == '\0') + return (value); + } if (XmuCompareISOLatin1(param, "true") == 0 || XmuCompareISOLatin1(param, "yes") == 0 @@ -188,7 +189,6 @@ Bool XawBooleanExpression(Widget w, String param, XEvent *event) { XawEvalInfo info; - Bool retval; if (!param) return (False); @@ -215,16 +215,18 @@ XawBooleanExpression(Widget w, String param, XEvent *event) (void)get_token(&info); if (info.token == ERROR) return (False); - retval = expr(&info); + else + { + Bool retval = expr(&info); - return (info.token != ERROR ? retval : False); + return (info.token != ERROR ? retval : False); + } } static int get_token(XawEvalInfo *info) { int ch; - char *p, name[256]; info->lp = info->cp; @@ -248,7 +250,8 @@ get_token(XawEvalInfo *info) { Bool succeed = True; - p = info->cp - 1; + char *p = info->cp - 1; + char name[256]; while ((ch = *info->cp) && (isalnum(ch) || ch == '_')) ++info->cp; @@ -499,8 +502,6 @@ XawGetValuesAction(Widget w, XEvent *event, { XawActionResList *rlist; XawActionVarList *vlist; - String value; - Cardinal count; if (!(*num_params & 1)) { @@ -513,9 +514,10 @@ XawGetValuesAction(Widget w, XEvent *event, rlist = XawGetActionResList(XtClass(w)); vlist = XawGetActionVarList(w); - for (count = 1; count < *num_params; count += 2) + for (Cardinal count = 1; count < *num_params; count += 2) { - if ((value = XawConvertActionRes(rlist, w, params[count + 1])) == NULL) + String value = XawConvertActionRes(rlist, w, params[count + 1]); + if (value == NULL) continue; XawDeclareActionVar(vlist, params[count], value); } @@ -526,7 +528,6 @@ XawDeclareAction(Widget w, XEvent *event, String *params, Cardinal *num_params) { XawActionVarList *vlist; - Cardinal count; if (!(*num_params & 1)) { @@ -538,7 +539,7 @@ XawDeclareAction(Widget w, XEvent *event, vlist = XawGetActionVarList(w); - for (count = 1; count < *num_params; count += 2) + for (Cardinal count = 1; count < *num_params; count += 2) XawDeclareActionVar(vlist, params[count], params[count + 1]); } @@ -865,11 +866,9 @@ _XawFindActionRes(XawActionResList *list, Widget detail, String name) static char * _XawEscapeActionVarValue(String value) { - char * escape; - if (value[0] == '$' || value[0] == '\\') { - escape = XtMalloc((Cardinal)strlen(value) + 2); + char *escape = XtMalloc((Cardinal)strlen(value) + 2); escape[0] = '\\'; strcpy(escape + 1, value); return (escape); @@ -881,11 +880,9 @@ _XawEscapeActionVarValue(String value) static char * _XawUnescapeActionVarValue(String value) { - char * unescape; - if (value[0] == '\\') { - unescape = XtMalloc((Cardinal)strlen(value)); + char *unescape = XtMalloc((Cardinal)strlen(value)); strcpy(unescape, value + 1); return (unescape); } diff --git a/src/AsciiSink.c b/src/AsciiSink.c index 29850ba..74587c6 100644 --- a/src/AsciiSink.c +++ b/src/AsciiSink.c @@ -296,7 +296,7 @@ static int GetTextWidth(TextWidget ctx, int current_width, XFontStruct *font, XawTextPosition from, int length) { - int i, width = 0; + int width = 0; XawTextBlock block; XawTextPosition pos = from; @@ -304,7 +304,7 @@ GetTextWidth(TextWidget ctx, int current_width, XFontStruct *font, pos = XawTextSourceRead(ctx->text.source, from, &block, length); length = (int)(length - (pos - from)); from = pos; - for (i = 0; i < block.length; i++) + for (int i = 0; i < block.length; i++) width += CharWidth((AsciiSinkObject)ctx->text.sink, font, current_width + width, (unsigned char)block.ptr[i]); @@ -340,7 +340,6 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y, XawTextAnchor *anchor; XawTextEntity *entity; XawTextProperty *property; - XawTextPaintStruct *paint; XawTextBlock block; XFontStruct *font; @@ -373,7 +372,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y, rbearing = font->per_char[c - font->min_char_or_byte2].rbearing - font->per_char[c - font->min_char_or_byte2].width; if (rbearing > 0) { - paint = XtNew(XawTextPaintStruct); + XawTextPaintStruct *paint = XtNew(XawTextPaintStruct); paint->next = sink->text_sink.paint->bearings; sink->text_sink.paint->bearings = paint; paint->x = x - (paint->width = CharWidth(sink, font, 0, c)); @@ -408,7 +407,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y, (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) lbearing = font->per_char[c - font->min_char_or_byte2].lbearing; if (lbearing < 0) { - paint = XtNew(XawTextPaintStruct); + XawTextPaintStruct *paint = XtNew(XawTextPaintStruct); paint->next = sink->text_sink.paint->bearings; sink->text_sink.paint->bearings = paint; paint->x = x; @@ -442,10 +441,9 @@ AsciiPreparePaint(Widget w, int y, int line, XawTextAnchor *anchor; XawTextEntity *entity; XawTextProperty *property; - int i, ascent = 0, descent = 0, xl, xr, x = ctx->text.left_margin, bufsiz; + int i, ascent = 0, descent = 0, xl, xr, x = ctx->text.left_margin; XawTextBlock block; XFontStruct *font; - XawTextPaintStruct *paint; if (!sink->ascii_sink.echo) return; @@ -530,7 +528,9 @@ AsciiPreparePaint(Widget w, int y, int line, /* pass 2: feed the XawTextPaintStruct lists */ pos = from; while (pos < to) { - paint = XtNew(XawTextPaintStruct); + int bufsiz; + XawTextPaintStruct *paint = XtNew(XawTextPaintStruct); + paint->next = sink->text_sink.paint->paint; sink->text_sink.paint->paint = paint; paint->x = x; @@ -1462,13 +1462,14 @@ FindDistance(Widget w, XawTextPosition fromPos, int fromx, XFontStruct *font = sink->ascii_sink.font; Widget source = ctx->text.source; XawTextPosition idx, pos; - unsigned char c; XawTextBlock blk; int i, rWidth; pos = XawTextSourceRead(source, fromPos, &blk, toPos - fromPos); rWidth = 0; for (i = 0, idx = fromPos; idx < toPos; i++, idx++) { + unsigned char c; + if (i >= blk.length) { i = 0; pos = XawTextSourceRead(source, pos, &blk, toPos - pos); diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index f493b06..0ce721b 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -977,8 +977,6 @@ XawAsciiSrcSetValues(Widget current, Widget request _X_UNUSED, Widget cnew, AsciiSrcObject src = (AsciiSrcObject)cnew; AsciiSrcObject old_src = (AsciiSrcObject)current; Bool total_reset = False, string_set = False; - FILE *file; - unsigned int i; if (old_src->ascii_src.use_string_in_place != src->ascii_src.use_string_in_place) { @@ -989,20 +987,22 @@ XawAsciiSrcSetValues(Widget current, Widget request _X_UNUSED, Widget cnew, old_src->ascii_src.use_string_in_place; } - for (i = 0; i < *num_args ; i++) + for (unsigned int i = 0; i < *num_args ; i++) if (streq(args[i].name, XtNstring)) { string_set = True; break; } if (string_set || (old_src->ascii_src.type != src->ascii_src.type)) { + FILE *file; + RemoveOldStringOrFile(old_src, string_set); /* remove old info */ file = InitStringOrFile(src, string_set); /* Init new info */ LoadPieces(src, file, NULL); /* load new info into internal buffers */ if (file != NULL) fclose(file); #ifndef OLDXAW - for (i = 0; i < src->text_src.num_text; i++) + for (unsigned int i = 0; i < src->text_src.num_text; i++) /* Tell text widget what happened */ XawTextSetSource(src->text_src.text[i], cnew, 0); #else @@ -1043,10 +1043,9 @@ static void XawAsciiSrcGetValuesHook(Widget w, ArgList args, Cardinal *num_args) { AsciiSrcObject src = (AsciiSrcObject)w; - unsigned int i; if (src->ascii_src.type == XawAsciiString) { - for (i = 0; i < *num_args ; i++) + for (unsigned int i = 0; i < *num_args ; i++) if (streq(args[i].name, XtNstring)) { if (src->ascii_src.use_string_in_place) *((char **)args[i].value) = src->ascii_src.first_piece->text; @@ -1321,11 +1320,10 @@ WritePiecesToFile(AsciiSrcObject src, String name) int fd; if (src->ascii_src.data_compression) { - Piece *tmp; - piece = src->ascii_src.first_piece; while (piece) { int bytes = (int)(src->ascii_src.piece_size - piece->used); + Piece *tmp; if (bytes > 0 && (tmp = piece->next) != NULL) { bytes = (XawMin(bytes, tmp->used)); @@ -1407,8 +1405,6 @@ InitStringOrFile(AsciiSrcObject src, Bool newString) { mode_t open_mode = 0; const char *fdopen_mode = NULL; - int fd; - FILE *file; if (src->ascii_src.type == XawAsciiString) { if (src->ascii_src.string == NULL) @@ -1481,8 +1477,12 @@ InitStringOrFile(AsciiSrcObject src, Bool newString) } if (!src->ascii_src.is_tempfile) { - if ((fd = open(src->ascii_src.string, (int)open_mode, 0666)) != -1) { - if ((file = fdopen(fd, fdopen_mode))) { + int fd = open(src->ascii_src.string, (int)open_mode, 0666); + + if (fd != -1) { + FILE *file = fdopen(fd, fdopen_mode); + + if (file != NULL) { (void)fseek(file, 0, SEEK_END); src->ascii_src.length = (XawTextPosition)ftell(file); return (file); @@ -1515,11 +1515,11 @@ LoadPieces(AsciiSrcObject src, FILE *file, char *string) if (string == NULL) { if (src->ascii_src.type == XawAsciiFile) { if (src->ascii_src.length != 0) { - int len; - left = 0; fseek(file, 0, SEEK_SET); while (left < src->ascii_src.length) { + int len; + ptr = XtMalloc((unsigned)src->ascii_src.piece_size); if ((len = (int)fread(ptr, sizeof(unsigned char), (size_t)src->ascii_src.piece_size, file)) < 0) diff --git a/src/Box.c b/src/Box.c index 4f759c5..90cbbf6 100644 --- a/src/Box.c +++ b/src/Box.c @@ -208,7 +208,6 @@ DoLayout(BoxWidget bbw, unsigned int width, unsigned int height, Dimension lw, lh; /* Width and height needed for current line */ Dimension bw, bh; /* Width and height needed for current widget */ Dimension h_space; /* Local copy of bbw->box.h_space */ - Widget widget; /* Current widget */ unsigned int num_mapped_children = 0; /* Box width and height */ @@ -230,7 +229,7 @@ DoLayout(BoxWidget bbw, unsigned int width, unsigned int height, lw = h_space; for (i = 0; i < bbw->composite.num_children; i++) { - widget = bbw->composite.children[i]; + Widget widget = bbw->composite.children[i]; /* Current widget */ if (widget->core.managed) { if (widget->core.mapped_when_managed) num_mapped_children++; @@ -525,9 +524,6 @@ static XtGeometryResult XawBoxGeometryManager(Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply _X_UNUSED) { - Dimension width, height, borderWidth; - BoxWidget bbw; - /* Position request always denied */ if (((request->request_mode & CWX) && request->x != XtX(w)) || ((request->request_mode & CWY) && request->y != XtY(w))) @@ -535,6 +531,9 @@ XawBoxGeometryManager(Widget w, XtWidgetGeometry *request, /* Size changes must see if the new size can be accommodated */ if (request->request_mode & (CWWidth | CWHeight | CWBorderWidth)) { + Dimension width, height, borderWidth; + BoxWidget bbw; + /* Make all three fields in the request valid */ if ((request->request_mode & CWWidth) == 0) request->width = XtWidth(w); @@ -544,12 +543,12 @@ XawBoxGeometryManager(Widget w, XtWidgetGeometry *request, request->border_width = XtBorderWidth(w); /* Save current size and set to new size */ - width = XtWidth(w); - height = XtHeight(w); - borderWidth = XtBorderWidth(w); - XtWidth(w) = request->width; - XtHeight(w) = request->height; - XtBorderWidth(w) = request->border_width; + width = XtWidth(w); + height = XtHeight(w); + borderWidth = XtBorderWidth(w); + XtWidth(w) = request->width; + XtHeight(w) = request->height; + XtBorderWidth(w) = request->border_width; /* Decide if new layout works: (1) new widget is smaller, diff --git a/src/Command.c b/src/Command.c index d9db81a..7adf3fd 100644 --- a/src/Command.c +++ b/src/Command.c @@ -563,9 +563,8 @@ static void XawCommandGetValuesHook(Widget w, ArgList args, Cardinal *num_args) { CommandWidget cbw = (CommandWidget)w; - unsigned int i; - for (i = 0; i < *num_args; i++) { + for (unsigned int i = 0; i < *num_args; i++) { if (STR_EQUAL(args[i].name, XtNforeground)) *((String*)args[i].value) = cbw->command.set ? (String)cbw->core.background_pixel : (String)cbw->label.foreground; diff --git a/src/Dialog.c b/src/Dialog.c index 925c975..0e193fb 100644 --- a/src/Dialog.c +++ b/src/Dialog.c @@ -271,7 +271,6 @@ XawDialogSetValues(Widget current, Widget request _X_UNUSED, Widget cnew, DialogWidget w = (DialogWidget)cnew; DialogWidget old = (DialogWidget)current; Arg args[5]; - Cardinal num_args; unsigned int i; Bool checks[NUM_CHECKS]; @@ -310,7 +309,8 @@ XawDialogSetValues(Widget current, Widget request _X_UNUSED, Widget cnew, } if (checks[LABEL]) { - num_args = 0; + Cardinal num_args = 0; + XtSetArg(args[num_args], XtNlabel, w->dialog.label); num_args++; if (w->dialog.iconW != NULL && XtHeight(w->dialog.labelW) <= XtHeight(w->dialog.iconW)) { @@ -359,9 +359,8 @@ XawDialogGetValuesHook(Widget w, ArgList args, Cardinal *num_args) Arg a[1]; char * s; DialogWidget src = (DialogWidget)w; - unsigned int i; - for (i = 0; i < *num_args; i++) + for (unsigned int i = 0; i < *num_args; i++) { if (streq(args[i].name, XtNvalue)) { XtSetArg(a[0], XtNstring, &s); XtGetValues(src->dialog.valueW, a, 1); @@ -372,6 +371,7 @@ XawDialogGetValuesHook(Widget w, ArgList args, Cardinal *num_args) XtGetValues(src->dialog.labelW, a, 1); *((char **)args[i].value) = s; } + } } /* diff --git a/src/DisplayList.c b/src/DisplayList.c index ae5e7c6..135da85 100644 --- a/src/DisplayList.c +++ b/src/DisplayList.c @@ -122,15 +122,12 @@ void XawRunDisplayList(Widget w, _XawDisplayList *list, XEvent *event, Region region) { - XawDLProc *proc; - Cardinal i; - if (!XtIsRealized(w)) return; - for (i = 0; i < list->num_procs; i++) + for (Cardinal i = 0; i < list->num_procs; i++) { - proc = list->procs[i]; + XawDLProc *proc = list->procs[i]; proc->proc(w, proc->args, proc->data->data, event, region); } } @@ -236,8 +233,6 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen, char cname[64], fname[64], aname[1024]; Cardinal i; String cp; - String fp; - String lp; int status; xlibc = XawGetDisplayListClass(xlib); @@ -264,6 +259,8 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen, status = 0; while (status != DLEOF) { + String fp, lp; + lp = cp; cp = read_token(cp, fname, sizeof(fname), &status); @@ -448,17 +445,13 @@ XawDisplayListString(_XawDisplayList *dlist) void XawDestroyDisplayList(_XawDisplayList *dlist) { - Cardinal i, j; - XawDLProc *proc; - XawDLData *data; - if (!dlist) return; - for (i = 0; i < dlist->num_procs; i++) + for (Cardinal i = 0; i < dlist->num_procs; i++) { - proc = dlist->procs[i]; - data = proc->data; + XawDLProc *proc = dlist->procs[i]; + XawDLData *data = proc->data; if (data) { @@ -479,7 +472,7 @@ XawDestroyDisplayList(_XawDisplayList *dlist) } } - for (j = 0; j < proc->num_params; j++) + for (Cardinal j = 0; j < proc->num_params; j++) XtFree((char *)proc->params[j]); if (proc->num_params) XtFree((char *)proc->params); @@ -707,7 +700,6 @@ DlXPoints(Widget w, XtPointer args, XtPointer data, int id) { XawDLPositionPtr *pos_ptr = (XawDLPositionPtr *)args; XawXlibData *xdata = (XawXlibData *)data; - XawDLPosition *pos; XPoint points_buf[16]; XPoint *points; Display *display; @@ -719,7 +711,7 @@ DlXPoints(Widget w, XtPointer args, XtPointer data, int id) for (i = j = 0; i < num_points; i++, j = i << 1) { - pos = &pos_ptr->pos[j]; + XawDLPosition *pos = &pos_ptr->pos[j]; points[i].x = X_ARG(pos[0]); points[i].y = Y_ARG(pos[1]); } @@ -938,7 +930,6 @@ DlDrawSegments(Widget w, XtPointer args, XtPointer data, { XawDLPositionPtr *pos_ptr = (XawDLPositionPtr *)args; XawXlibData *xdata = (XawXlibData *)data; - XawDLPosition *pos; XSegment *segments; XSegment segments_buf[8]; Display *display; @@ -950,7 +941,7 @@ DlDrawSegments(Widget w, XtPointer args, XtPointer data, for (i = j = 0; i < num_segments; i++, j = i << 2) { - pos = &pos_ptr->pos[j]; + XawDLPosition *pos = &pos_ptr->pos[j]; segments[i].x1 = X_ARG(pos[0]); segments[i].y1 = Y_ARG(pos[1]); segments[i].x2 = X_ARG(pos[2]); @@ -1323,10 +1314,8 @@ DlClipRectangles(Widget w, XtPointer args, XtPointer data, { XawDLPositionPtr *pos_ptr = (XawDLPositionPtr *)args; XawXlibData *xdata = (XawXlibData *)data; - XawDLPosition *pos; XRectangle *rects; XRectangle rects_buf[8]; - Position x1, y1, x2, y2; Cardinal num_rects, i, j; num_rects = pos_ptr->num_pos>>2; @@ -1334,11 +1323,11 @@ DlClipRectangles(Widget w, XtPointer args, XtPointer data, for (i = j = 0; i < num_rects; i++, j = i << 2) { - pos = &pos_ptr->pos[j]; - x1 = X_ARG(pos[0]); - y1 = Y_ARG(pos[1]); - x2 = X_ARG(pos[2]); - y2 = Y_ARG(pos[3]); + XawDLPosition *pos = &pos_ptr->pos[j]; + Position x1 = X_ARG(pos[0]); + Position y1 = Y_ARG(pos[1]); + Position x2 = X_ARG(pos[2]); + Position y2 = Y_ARG(pos[3]); rects[i].x = XawMin(x1, x2); rects[i].y = XawMin(y1, y2); rects[i].width = (unsigned short)(XawMax(x1, x2) - rects[i].x); diff --git a/src/Form.c b/src/Form.c index f673d3e..dbdaa76 100644 --- a/src/Form.c +++ b/src/Form.c @@ -301,13 +301,12 @@ WidgetClass formWidgetClass = (WidgetClass)&formClassRec; static void XawFormRealize(Widget w, Mask *mask, XSetWindowAttributes *attr) { - XawPixmap *pixmap; - (*formWidgetClass->core_class.superclass->core_class.realize)(w, mask, attr); if (w->core.background_pixmap > XtUnspecifiedPixmap) { - pixmap = XawPixmapFromXPixmap(w->core.background_pixmap, XtScreen(w), - w->core.colormap, (int)w->core.depth); + XawPixmap *pixmap = + XawPixmapFromXPixmap(w->core.background_pixmap, XtScreen(w), + w->core.colormap, (int)w->core.depth); if (pixmap && pixmap->mask) XawReshapeWidget(w, pixmap); } @@ -1022,10 +1021,8 @@ static void XawFormChangeManaged(Widget w) { FormWidget fw = (FormWidget)w; - FormConstraints form; WidgetList children, childP; int num_children = (int)fw->composite.num_children; - Widget child; (*((FormWidgetClass)w->core.widget_class)->form_class.layout) (fw, XtWidth(w), XtHeight(w), True); @@ -1035,7 +1032,8 @@ XawFormChangeManaged(Widget w) for (children = childP = fw->composite.children; childP - children < num_children; childP++) { - child = *childP; + FormConstraints form; + Widget child = *childP; if (!XtIsManaged(child)) continue; form = (FormConstraints)child->core.constraints; diff --git a/src/Label.c b/src/Label.c index cec1875..e75139a 100644 --- a/src/Label.c +++ b/src/Label.c @@ -644,13 +644,12 @@ XawLabelSetValues(Widget current, Widget request, Widget cnew, LabelWidget curlw = (LabelWidget)current; LabelWidget reqlw = (LabelWidget)request; LabelWidget newlw = (LabelWidget)cnew; - unsigned int i; Boolean was_resized = False, redisplay = False, checks[NUM_CHECKS]; - for (i = 0; i < NUM_CHECKS; i++) + for (unsigned int i = 0; i < NUM_CHECKS; i++) checks[i] = False; - for (i = 0; i < *num_args; i++) { + for (unsigned int i = 0; i < *num_args; i++) { if (streq(XtNbitmap, args[i].name)) checks[PIXMAP] = True; else if (streq(XtNwidth, args[i].name)) diff --git a/src/List.c b/src/List.c index de76597..2bcbb9d 100644 --- a/src/List.c +++ b/src/List.c @@ -353,7 +353,6 @@ GetGCs(Widget w) static void CalculatedValues(Widget w) { - int i, len; ListWidget lw = (ListWidget)w; /* If list is NULL then the list will just be the name of the widget */ @@ -371,7 +370,9 @@ CalculatedValues(Widget w) if (LongestFree(lw)) { lw->list.longest = 0; /* so it will accumulate real longest below */ - for (i = 0 ; i < lw->list.nitems; i++) { + for (int i = 0 ; i < lw->list.nitems; i++) { + int len; + if (lw->simple.international == True) len = XmbTextEscapement(lw->list.fontset, lw->list.list[i], (int)strlen(lw->list.list[i])); diff --git a/src/MultiSink.c b/src/MultiSink.c index c9d5169..c93eeea 100644 --- a/src/MultiSink.c +++ b/src/MultiSink.c @@ -551,7 +551,6 @@ FindDistance(Widget w, XawTextPosition fromPos, int fromx, TextWidget ctx = (TextWidget)XtParent(w); Widget source = ctx->text.source; XawTextPosition idx, pos; - wchar_t c; XFontSetExtents *ext = XExtentsOfFontSet(fontset); XawTextBlock blk; int i, rWidth; @@ -559,6 +558,8 @@ FindDistance(Widget w, XawTextPosition fromPos, int fromx, pos = XawTextSourceRead(source, fromPos, &blk, (int)(toPos - fromPos)); rWidth = 0; for (i = 0, idx = fromPos; idx < toPos; i++, idx++) { + wchar_t c; + if (i >= blk.length) { i = 0; XawTextSourceRead(source, pos, &blk, (int)(toPos - pos)); diff --git a/src/MultiSrc.c b/src/MultiSrc.c index 5544b8b..34e17e2 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -873,10 +873,9 @@ static void XawMultiSrcGetValuesHook(Widget w, ArgList args, Cardinal *num_args) { MultiSrcObject src = (MultiSrcObject)w; - unsigned int i; if (src->multi_src.type == XawAsciiString) { - for (i = 0; i < *num_args ; i++) { + for (unsigned int i = 0; i < *num_args ; i++) { if (streq(args[i].name, XtNstring)) { if (src->multi_src.use_string_in_place) *((char **)args[i].value) = (char *) @@ -1038,13 +1037,10 @@ Bool _XawMultiSaveAsFile(Widget w, _Xconst char* name) { MultiSrcObject src = (MultiSrcObject)w; - char * mb_string; - Bool ret; - - mb_string = StorePiecesInString(src); + char *mb_string = StorePiecesInString(src); if (mb_string != 0) { - ret = WriteToFile(mb_string, (String)name); + Bool ret = WriteToFile(mb_string, (String)name); XtFree(mb_string); return (ret); diff --git a/src/Paned.c b/src/Paned.c index 363c969..13e238d 100644 --- a/src/Paned.c +++ b/src/Paned.c @@ -1041,7 +1041,6 @@ static void StartGripAdjustment(PanedWidget pw, Widget grip, Direction dir) { Widget *childP; - Cursor cursor; pw->paned.whichadd = pw->paned.whichsub = NULL; @@ -1054,6 +1053,8 @@ StartGripAdjustment(PanedWidget pw, Widget grip, Direction dir) * Change the cursor */ if (XtIsRealized(grip)) { + Cursor cursor; + if (IsVert(pw)) { if (dir == UpLeftPane) cursor = pw->paned.adjust_upper_cursor; @@ -1452,7 +1453,6 @@ ChangeAllGripCursors(PanedWidget pw) Widget *childP; ForAllPanes(pw, childP) { - Arg arglist[1]; Cursor cursor; if ((cursor = pw->paned.grip_cursor) == None) { @@ -1463,6 +1463,8 @@ ChangeAllGripCursors(PanedWidget pw) } if (HasGrip(*childP)) { + Arg arglist[1]; + XtSetArg(arglist[0], XtNcursor, cursor); XtSetValues(PaneInfo(*childP)->grip, arglist, 1); } diff --git a/src/Pixmap.c b/src/Pixmap.c index 7072eb3..9a3a765 100644 --- a/src/Pixmap.c +++ b/src/Pixmap.c @@ -707,7 +707,6 @@ BitmapLoader(XawParams *params, Screen *screen, Colormap colormap, int depth, { Pixel fg, bg; XColor color, exact; - Pixmap pixmap; unsigned int width, height; unsigned char *data = NULL; int hotX, hotY; @@ -760,10 +759,11 @@ BitmapLoader(XawParams *params, Screen *screen, Colormap colormap, int depth, if (XReadBitmapFileData(filename, &width, &height, &data, &hotX, &hotY) == BitmapSuccess) { - pixmap = XCreatePixmapFromBitmapData(DisplayOfScreen(screen), - RootWindowOfScreen(screen), - (char *)data, - width, height, fg, bg, (unsigned)depth); + Pixmap pixmap = + XCreatePixmapFromBitmapData(DisplayOfScreen(screen), + RootWindowOfScreen(screen), + (char *)data, + width, height, fg, bg, (unsigned)depth); if (data) XFree(data); *pixmap_return = pixmap; diff --git a/src/SimpleMenu.c b/src/SimpleMenu.c index 4ac62a5..e62c028 100644 --- a/src/SimpleMenu.c +++ b/src/SimpleMenu.c @@ -1306,12 +1306,12 @@ AddPositionAction(XtAppContext app_con, XPointer data _X_UNUSED) static Widget FindMenu(Widget widget, String name) { - Widget w, menu; + for (Widget w = widget; w != NULL; w = XtParent(w)) { + Widget menu = XtNameToWidget(w, name); - for (w = widget; w != NULL; w = XtParent(w)) - if ((menu = XtNameToWidget(w, name)) != NULL) + if (menu != NULL) return (menu); - + } return (NULL); } @@ -1458,11 +1458,12 @@ static void MakeSetValuesRequest(Widget w, unsigned int width, unsigned int height) { SimpleMenuWidget smw = (SimpleMenuWidget)w; - Arg arglist[2]; - Cardinal num_args = 0; if (!smw->simple_menu.recursive_set_values) { if (XtWidth(smw) != width || XtHeight(smw) != height) { + Arg arglist[2]; + Cardinal num_args = 0; + smw->simple_menu.recursive_set_values = True; XtSetArg(arglist[num_args], XtNwidth, width); num_args++; XtSetArg(arglist[num_args], XtNheight, height); num_args++; diff --git a/src/StripChart.c b/src/StripChart.c index 942a7d5..702c419 100644 --- a/src/StripChart.c +++ b/src/StripChart.c @@ -385,7 +385,6 @@ draw_it(XtPointer client_data, XtIntervalId *id _X_UNUSED) static int repaint_window(StripChartWidget w, int left, int width) { - int i, j; int next = w->strip_chart.interval; int scale = w->strip_chart.scale; int scalewidth = 0; @@ -424,7 +423,7 @@ repaint_window(StripChartWidget w, int left, int width) width = NUM_VALUEDATA(w); /* Draw data point lines */ - for (i = left; i < width; i++) { + for (int i = left; i < width; i++) { int y = (int)(XtHeight(w) - (XtHeight(w) * w->strip_chart.valuedata[i]) / w->strip_chart.scale); @@ -433,8 +432,8 @@ repaint_window(StripChartWidget w, int left, int width) } /* Draw graph reference lines */ - for (i = 1; i < w->strip_chart.scale; i++) { - j = i * ((int)XtHeight(w) / w->strip_chart.scale); + for (int i = 1; i < w->strip_chart.scale; i++) { + int j = i * ((int)XtHeight(w) / w->strip_chart.scale); XDrawLine(dpy, win, w->strip_chart.hiGC, left, j, scalewidth, j); } } diff --git a/src/Text.c b/src/Text.c index da15a37..521bafe 100644 --- a/src/Text.c +++ b/src/Text.c @@ -1124,18 +1124,15 @@ _XawTextGetText(TextWidget ctx, XawTextPosition left, XawTextPosition right) char * _XawTextGetSTRING(TextWidget ctx, XawTextPosition left, XawTextPosition right) { - unsigned char *s; - unsigned char c; - long i, j, n; - wchar_t *ws, wc; - /* allow ESC in accordance with ICCCM */ if (XawTextFormat(ctx, XawFmtWide)) { MultiSinkObject sink = (MultiSinkObject)ctx->text.sink; - ws = (wchar_t *)_XawTextGetText(ctx, left, right); - n = (long)wcslen(ws); + wchar_t *ws = (wchar_t *)_XawTextGetText(ctx, left, right); + long n = (long)wcslen(ws); + long i, j; + for (j = 0, i = 0; j < n; j++) { - wc = ws[j]; + wchar_t wc = ws[j]; if (XwcTextEscapement (sink->multi_sink.fontset, &wc, 1) || (wc == _Xaw_atowc(XawTAB)) || (wc == _Xaw_atowc(XawLF)) || (wc == _Xaw_atowc(XawESC))) @@ -1145,12 +1142,13 @@ _XawTextGetSTRING(TextWidget ctx, XawTextPosition left, XawTextPosition right) return ((char *)ws); } else { - s = (unsigned char *)_XawTextGetText(ctx, left, right); + unsigned char *s = (unsigned char *)_XawTextGetText(ctx, left, right); /* only HT and NL control chars are allowed, strip out others */ - n = (long)strlen((char *)s); - i = 0; + long n = (long)strlen((char *)s); + long i = 0, j; + for (j = 0; j < n; j++) { - c = s[j]; + unsigned char c = s[j]; if (((c >= 0x20) && c <= 0x7f) ||(c >= 0xa0) || (c == XawTAB) || (c == XawLF) || (c == XawESC)) { @@ -1222,14 +1220,15 @@ static Bool LineAndXYForPosition(TextWidget ctx, XawTextPosition pos, int *line, int *x, int *y) { - XawTextPosition linePos, endPos; Boolean visible; - int realW, realH; *line = 0; *x = ctx->text.left_margin; *y = ctx->text.margin.top + 1; if ((visible = IsPositionVisible(ctx, pos)) != False) { + XawTextPosition linePos, endPos; + int realW, realH; + *line = LineForPosition(ctx, pos); *y = ctx->text.lt.info[*line].y; linePos = ctx->text.lt.info[*line].position; @@ -1252,12 +1251,11 @@ void _XawTextBuildLineTable(TextWidget ctx, XawTextPosition position, _XtBoolean force_rebuild) { - Dimension height = 0; int lines = 0; Cardinal size; if ((int)XtHeight(ctx) > VMargins(ctx)) { - height = (Dimension)(XtHeight(ctx) - VMargins(ctx)); + Dimension height = (Dimension)(XtHeight(ctx) - VMargins(ctx)); lines = XawTextSinkMaxLines(ctx->text.sink, height); } size = (Cardinal)(sizeof(XawTextLineTableEntry) * (size_t)(lines + 1)); @@ -1486,9 +1484,11 @@ GetWidestLine(TextWidget ctx) void _XawTextSetScrollBars(TextWidget ctx) { - float first, last, denom, widest; + float first; if (ctx->text.scroll_vert == XawtextScrollAlways) { + float last; + if (ctx->text.lastPos == 0) first = 0.0; else @@ -1504,7 +1504,9 @@ _XawTextSetScrollBars(TextWidget ctx) } if (ctx->text.scroll_horiz == XawtextScrollAlways) { - denom = (float)GetWidestLine(ctx); + float denom = (float)GetWidestLine(ctx); + float widest; + if (denom <= 0) denom = (float)((int)XtWidth(ctx) - RHMargins(ctx)); if (denom <= 0) @@ -1956,7 +1958,6 @@ TextConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, TextWidget ctx = (TextWidget)w; Widget src = ctx->text.source; XawTextEditType edit_mode; - Arg args[1]; XawTextSelectionSalt *salt = NULL; XawTextSelection *s; @@ -1966,9 +1967,12 @@ TextConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, if (SrcCvtSel(src, selection, target, type, value, length, format)) return (True); + else { + Arg args[1]; - XtSetArg(args[0], XtNeditType, &edit_mode); - XtGetValues(src, args, ONE); + XtSetArg(args[0], XtNeditType, &edit_mode); + XtGetValues(src, args, ONE); + } XmuConvertStandardSelection(w, ctx->text.time, selection, target, type, (XPointer*)&std_targets, @@ -2352,10 +2356,10 @@ _SetSelection(TextWidget ctx, XawTextPosition left, XawTextPosition right, if (left < right) { Widget w = (Widget)ctx; - int buffer; while (count) { Atom selection = selections[--count]; + int buffer; /* * If this is a cut buffer @@ -2679,7 +2683,7 @@ OldDisplayText(Widget w, XawTextPosition left, XawTextPosition right) TextWidget ctx = (TextWidget)w; int x, y, line; - XawTextPosition start, end, last, final; + XawTextPosition last; XmuScanline *scan; XmuSegment *seg; XmuArea *clip = NULL; @@ -2697,7 +2701,10 @@ OldDisplayText(Widget w, XawTextPosition left, XawTextPosition right) if (cleol) clip = XmuCreateArea(); - for (start = left; start < right && line < ctx->text.lt.lines; line++) { + for (XawTextPosition start = left; + start < right && line < ctx->text.lt.lines; line++) { + XawTextPosition end, final; + if ((end = ctx->text.lt.info[line + 1].position) > right) end = right; @@ -2756,7 +2763,7 @@ DisplayText(Widget w, XawTextPosition left, XawTextPosition right) TextWidget ctx = (TextWidget)w; int y, line; - XawTextPosition from, to, lastPos; + XawTextPosition lastPos; Bool cleol = ctx->text.clear_to_eol; Bool has_selection = ctx->text.s.right > ctx->text.s.left; XawTextPaintList *paint_list; @@ -2773,8 +2780,11 @@ DisplayText(Widget w, XawTextPosition left, XawTextPosition right) paint_list = ((TextSinkObject)ctx->text.sink)->text_sink.paint; - for (from = left; from < right && line < ctx->text.lt.lines; line++) { - if ((to = ctx->text.lt.info[line + 1].position) > right) + for (XawTextPosition from = left; + from < right && line < ctx->text.lt.lines; line++) { + XawTextPosition to = ctx->text.lt.info[line + 1].position; + + if (to > right) to = right; if (to > lastPos) @@ -2834,7 +2844,7 @@ static void DoSelection(TextWidget ctx, XawTextPosition pos, Time time, Bool motion) { XawTextPosition newLeft, newRight; - XawTextSelectType newType, *sarray; + XawTextSelectType newType; Widget src = ctx->text.source; if (motion) @@ -2842,7 +2852,8 @@ DoSelection(TextWidget ctx, XawTextPosition pos, Time time, Bool motion) else { if ((labs((long) time - (long) ctx->text.lasttime) < MULTI_CLICK_TIME) && (pos >= ctx->text.s.left && pos <= ctx->text.s.right)) { - sarray = ctx->text.sarray; + XawTextSelectType *sarray = ctx->text.sarray; + for (; *sarray != XawselectNull && *sarray != ctx->text.s.type; sarray++) ; @@ -3348,11 +3359,11 @@ CountLines(TextWidget ctx, XawTextPosition left, XawTextPosition right) if (ctx->text.wrap == XawtextWrapNever || left >= right) return (1); else { - XawTextPosition tmp; int dim, lines = 0, wwidth = GetMaxTextWidth(ctx); while (left < right) { - tmp = left; + XawTextPosition tmp = left; + XawTextSinkFindPosition(ctx->text.sink, left, ctx->text.left_margin, wwidth, ctx->text.wrap == XawtextWrapWord, diff --git a/src/TextAction.c b/src/TextAction.c index 5eae39e..0e546fb 100644 --- a/src/TextAction.c +++ b/src/TextAction.c @@ -950,7 +950,6 @@ ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, TextWidget ctx = (TextWidget)w; Widget src = ctx->text.source; XawTextEditType edit_mode; - Arg args[1]; XawTextSelectionSalt *salt = NULL; XawTextSelection *s; @@ -960,9 +959,12 @@ ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, if (SrcCvtSel(src, selection, target, type, value, length, format)) return (True); + else { + Arg args[1]; - XtSetArg(args[0], XtNeditType,&edit_mode); - XtGetValues(src, args, 1); + XtSetArg(args[0], XtNeditType,&edit_mode); + XtGetValues(src, args, 1); + } XmuConvertStandardSelection(w, ctx->text.time, selection, target, type, (XPointer *)&std_targets, @@ -2322,11 +2324,10 @@ Indent(Widget w, XEvent *event, String *params _X_UNUSED, Cardinal *num_params _ TextWidget ctx = (TextWidget)w; TextSrcObject src = (TextSrcObject)ctx->text.source; XawTextPosition from, to, tmp, end = 0, *pos, *posbuf[32]; - char buf[32]; XawTextBlock text; int i, spaces = MULT(ctx); char *lbuf = NULL, *rbuf; - unsigned llen = 0, rlen, size; + unsigned llen = 0; Bool undo = src->textSrc.enable_undo && src->textSrc.undo_state == False; Bool format = ctx->text.auto_fill && ctx->text.left_column < ctx->text.right_column; @@ -2370,6 +2371,8 @@ Indent(Widget w, XEvent *event, String *params _X_UNUSED, Cardinal *num_params _ tmp = from; if (spaces > 0) { + char buf[32]; + text.ptr = XawStackAlloc((unsigned)spaces, buf); for (i = 0; i < spaces; i++) text.ptr[i] = ' '; @@ -2424,7 +2427,9 @@ Indent(Widget w, XEvent *event, String *params _X_UNUSED, Cardinal *num_params _ Tabify(ctx, from, to, pos, (int)src->textSrc.num_text, NULL); if (undo) { - rlen = (unsigned)(llen + (ctx->text.lastPos - end)); + unsigned rlen = (unsigned)(llen + (ctx->text.lastPos - end)); + unsigned size; + rbuf = _XawTextGetText(ctx, from, from + rlen); text.format = (unsigned long)_XawTextFormat(ctx); @@ -3520,7 +3525,7 @@ static XawTextPosition StripOutOldCRs(TextWidget ctx, XawTextPosition from, XawTextPosition to, XawTextPosition *pos, int num_pos) { - XawTextPosition startPos, endPos, eop_begin, eop_end, temp; + XawTextPosition startPos, endPos, eop_begin, eop_end; Widget src = ctx->text.source; XawTextBlock text; char *buf; @@ -3544,6 +3549,8 @@ StripOutOldCRs(TextWidget ctx, XawTextPosition from, XawTextPosition to, /* CONSTCOND */ while (TRUE) { + XawTextPosition temp; + endPos=SrcScan(src, startPos, XawstEOL, XawsdRight, 1, False); temp = SrcScan(src, endPos, XawstWhiteSpace, XawsdLeft, 1, False); diff --git a/src/TextSrc.c b/src/TextSrc.c index adea9b3..c59c3fc 100644 --- a/src/TextSrc.c +++ b/src/TextSrc.c @@ -1349,7 +1349,6 @@ FreeUndoBuffer(XawTextUndo *undo) static void UndoGC(XawTextUndo *undo) { - unsigned i; XawTextUndoList *head = undo->head, *redo = head->redo; if (head == undo->pointer || head == undo->end_mark @@ -1362,7 +1361,7 @@ UndoGC(XawTextUndo *undo) --head->left->refcount; if (--head->right->refcount == 0) { - for (i = 0; i < undo->num_undo; i+= 2) + for (unsigned i = 0; i < undo->num_undo; i+= 2) if (head->left == undo->undo[i] || head->left == undo->undo[i+1]) { if (head->left == undo->undo[i+1]) { XawTextUndoBuffer *tmp = redo->left; @@ -1673,13 +1672,15 @@ XawTextAnchor * XawTextSourceFindAnchor(Widget w, XawTextPosition position) { TextSrcObject src = (TextSrcObject)w; - int i = 0, left, right, nmemb = src->textSrc.num_anchors; - XawTextAnchor *anchor, **anchors = src->textSrc.anchors; + int left, right, nmemb = src->textSrc.num_anchors; + XawTextAnchor **anchors = src->textSrc.anchors; left = 0; right = nmemb - 1; while (left <= right) { - anchor = anchors[i = (left + right) >> 1]; + int i = (left + right) >> 1; + XawTextAnchor *anchor = anchors[i]; + if (anchor->position == position) return (anchor); else if (position < anchor->position) @@ -1701,7 +1702,6 @@ XawTextSourceAnchorAndEntity(Widget w, XawTextPosition position, { XawTextAnchor *anchor = XawTextSourceFindAnchor(w, position); XawTextEntity *pentity, *entity; - XawTextPosition offset; Bool next_anchor = True, retval = False; if (anchor->cache && anchor->position + anchor->cache->offset + @@ -1710,7 +1710,7 @@ XawTextSourceAnchorAndEntity(Widget w, XawTextPosition position, else pentity = entity = anchor->entities; while (entity) { - offset = anchor->position + entity->offset; + XawTextPosition offset = anchor->position + entity->offset; if (offset > position) { retval = next_anchor = False; @@ -1899,7 +1899,6 @@ XawTextSourceClearEntities(Widget w, XawTextPosition left, XawTextPosition right XawTextAnchor *anchor = XawTextSourceFindAnchor(w, left); XawTextEntity *entity, *eprev, *enext; XawTextPosition offset; - int length; while (anchor && anchor->entities == NULL) anchor = XawTextSourceRemoveAnchor(w, anchor); @@ -1928,7 +1927,7 @@ XawTextSourceClearEntities(Widget w, XawTextPosition left, XawTextPosition right offset = anchor->position + entity->offset; if (offset <= left) { - length = (XawMin(entity->length, left - offset)); + int length = (XawMin(entity->length, left - offset)); if (length <= 0) { enext = entity->next; diff --git a/src/Toggle.c b/src/Toggle.c index eb6281d..7ab6ad4 100644 --- a/src/Toggle.c +++ b/src/Toggle.c @@ -489,7 +489,6 @@ void XawToggleChangeRadioGroup(Widget w, Widget radio_group) { ToggleWidget tw = (ToggleWidget)w; - RadioGroup *group; RemoveFromRadioGroup(w); @@ -502,7 +501,9 @@ XawToggleChangeRadioGroup(Widget w, Widget radio_group) XawToggleUnsetCurrent(radio_group); if (radio_group != NULL) { - if ((group = GetRadioGroup(radio_group)) == NULL) + RadioGroup *group = GetRadioGroup(radio_group); + + if (group == NULL) CreateRadioGroup(w, radio_group); else AddToRadioGroup(group, w); diff --git a/src/Tree.c b/src/Tree.c index b3485f5..79a9b71 100644 --- a/src/Tree.c +++ b/src/Tree.c @@ -206,9 +206,6 @@ WidgetClass treeWidgetClass = (WidgetClass) &treeClassRec; static void initialize_dimensions(Dimension **listp, int *sizep, int n) { - int i; - Dimension *l; - if (!*listp) { *listp = (Dimension *) XtCalloc ((unsigned int) n, (unsigned int) sizeof(Dimension)); @@ -221,9 +218,14 @@ initialize_dimensions(Dimension **listp, int *sizep, int n) if (!*listp) { *sizep = 0; return; + } else { + int i; + Dimension *l; + + for (i = *sizep, l = (*listp) + i; i < n; i++, l++) + *l = 0; + *sizep = n; } - for (i = *sizep, l = (*listp) + i; i < n; i++, l++) *l = 0; - *sizep = n; } return; } @@ -282,7 +284,7 @@ static void delete_node(Widget parent, Widget node) { TreeConstraints pc; - int pos, i; + int pos; /* * Make sure the parent exists. @@ -308,7 +310,7 @@ delete_node(Widget parent, Widget node) * Fill in the gap left by the sub_node. * Zero the last slot for good luck. */ - for (i = pos; i < pc->tree.n_children; i++) + for (int i = pos; i < pc->tree.n_children; i++) pc->tree.children[i] = pc->tree.children[i+1]; pc->tree.children[pc->tree.n_children] = NULL; @@ -514,7 +516,6 @@ XawTreeConstraintDestroy(Widget w) { TreeConstraints tc = TREE_CONSTRAINT(w); TreeWidget tw = (TreeWidget) XtParent(w); - int i; /* * Remove the widget from its parent's sub-nodes list and @@ -529,7 +530,7 @@ XawTreeConstraintDestroy(Widget w) } delete_node (tc->tree.parent, (Widget) w); - for (i = 0; i< tc->tree.n_children; i++) + for (int i = 0; i< tc->tree.n_children; i++) insert_node (tc->tree.parent, tc->tree.children[i]); layout_tree ((TreeWidget) (w->core.parent), FALSE); @@ -597,12 +598,10 @@ XawTreeRedisplay(Widget gw, XEvent *event _X_UNUSED, Region region _X_UNUSED) * If the Tree widget is visible, visit each managed child. */ if (tw->core.visible) { - Cardinal i; - int j; Display *dpy = XtDisplay (tw); Window w = XtWindow (tw); - for (i = 0; i < tw->composite.num_children; i++) { + for (Cardinal i = 0; i < tw->composite.num_children; i++) { Widget child = tw->composite.children[i]; TreeConstraints tc = TREE_CONSTRAINT(child); @@ -629,7 +628,7 @@ XawTreeRedisplay(Widget gw, XEvent *event _X_UNUSED, Region region _X_UNUSED) break; } - for (j = 0; j < tc->tree.n_children; j++) { + for (int j = 0; j < tc->tree.n_children; j++) { Widget k = tc->tree.children[j]; GC gc = (tc->tree.gc ? tc->tree.gc : tw->tree.gc); @@ -722,7 +721,6 @@ static void compute_bounding_box_subtree(TreeWidget tree, Widget w, int depth) { TreeConstraints tc = TREE_CONSTRAINT(w); /* info attached to all kids */ - int i; Bool horiz = IsHorizontal (tree); Dimension newwidth, newheight; Dimension bw2 = (Dimension)(w->core.border_width * 2); @@ -754,7 +752,7 @@ compute_bounding_box_subtree(TreeWidget tree, Widget w, int depth) */ newwidth = 0; newheight = 0; - for (i = 0; i < tc->tree.n_children; i++) { + for (int i = 0; i < tc->tree.n_children; i++) { Widget child = tc->tree.children[i]; TreeConstraints cc = TREE_CONSTRAINT(child); @@ -792,8 +790,6 @@ compute_bounding_box_subtree(TreeWidget tree, Widget w, int depth) static void set_positions(TreeWidget tw, Widget w, int level) { - int i; - if (w) { TreeConstraints tc = TREE_CONSTRAINT(w); @@ -822,7 +818,7 @@ set_positions(TreeWidget tw, Widget w, int level) /* * Set the positions of all children. */ - for (i = 0; i < tc->tree.n_children; i++) + for (int i = 0; i < tc->tree.n_children; i++) set_positions (tw, tc->tree.children[i], level + 1); } } @@ -833,7 +829,6 @@ arrange_subtree(TreeWidget tree, Widget w, int depth, int x, int y) { TreeConstraints tc = TREE_CONSTRAINT(w); /* info attached to all kids */ TreeConstraints firstcc, lastcc; - int i; int newx, newy; Bool horiz = IsHorizontal (tree); Widget child = NULL; @@ -886,7 +881,7 @@ arrange_subtree(TreeWidget tree, Widget w, int depth, int x, int y) if (depth > 0) newy += tree->tree.vpad; } - for (i = 0; i < tc->tree.n_children; i++) { + for (int i = 0; i < tc->tree.n_children; i++) { TreeConstraints cc; child = tc->tree.children[i]; /* last value is used outside loop */ -- cgit v1.2.3