Variable scope reductions as recommended by cppcheck

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

6 files changed, 63 insertions, 69 deletions

diff --git a/Dvi.c b/Dvi.c
index 043f41b..1097f5e 100644
--- a/Dvi.c
+++ b/Dvi.c
@@ -483,7 +483,6 @@ SetDeviceResolution (DviWidget dw, int resolution)
 static void
 ShowDvi (DviWidget dw)
 {
-	int	i;
 	long	file_position;
 
 	if (!dw->dvi.file) 
@@ -500,7 +499,9 @@ ShowDvi (DviWidget dw)
 		FileSeek(dw, file_position);
 		dw->dvi.current_page = dw->dvi.requested_page;
 	} else {
-		for (i=dw->dvi.requested_page; i > 0; i--) {
+		int	i;
+
+		for (i = dw->dvi.requested_page; i > 0; i--) {
 			file_position = SearchPagePosition (dw, i);
 			if (file_position != -1)
 				break;
diff --git a/DviChar.c b/DviChar.c
index 3c88d4a..c34556c 100644
--- a/DviChar.c
+++ b/DviChar.c
@@ -26,11 +26,9 @@ static void	compute_hash(DviCharNameMap *map);
 DviCharNameMap *
 DviFindMap (const char *encoding)
 {
-	struct map_list	*m;
-
 	if (!standard_maps_loaded)
 		load_standard_maps ();
-	for (m = world; m; m=m->next)
+	for (struct map_list *m = world; m; m=m->next)
 		if (!strcmp (m->map->encoding, encoding))
 			return m->map;
 	return NULL;
@@ -60,12 +58,12 @@ static void
 dispose_hash (DviCharNameMap *map)
 {
 	DviCharNameHash	**buckets;
-	DviCharNameHash	*h, *next;
-	int		i;
 
 	buckets = map->buckets;
-	for (i = 0; i < DVI_HASH_SIZE; i++) {
-		for (h = buckets[i]; h; h=next) {
+	for (int i = 0; i < DVI_HASH_SIZE; i++) {
+		DviCharNameHash	*next;
+
+		for (DviCharNameHash *h = buckets[i]; h; h = next) {
 			next = h->next;
 			XtFree ((char *) h);
 		}
@@ -88,14 +86,15 @@ static void
 compute_hash (DviCharNameMap *map)
 {
 	DviCharNameHash	**buckets;
-	int		c, s, i;
-	DviCharNameHash	*h;
 
 	buckets = map->buckets;
-	for (i = 0; i < DVI_HASH_SIZE; i++)
+	for (int i = 0; i < DVI_HASH_SIZE; i++)
 		buckets[i] = NULL;
-	for (c = 0; c < DVI_MAP_SIZE; c++)
-		for (s = 0; s < DVI_MAX_SYNONYMS; s++) {
+	for (int c = 0; c < DVI_MAP_SIZE; c++) {
+		for (int s = 0; s < DVI_MAX_SYNONYMS; s++) {
+			DviCharNameHash	*h;
+			int		i;
+
 			if (!map->dvi_names[c][s])
 				break;
 			i = hash_name (map->dvi_names[c][s]) % DVI_HASH_SIZE;
@@ -105,7 +104,7 @@ compute_hash (DviCharNameMap *map)
 			h->name = map->dvi_names[c][s];
 			h->position = c;
 		}
-	
+	}
 }
 
 int
diff --git a/XFontName.c b/XFontName.c
index e43f347..3a70f2a 100644
--- a/XFontName.c
+++ b/XFontName.c
@@ -43,7 +43,6 @@ extractUnsignedField (
 	unsigned int	bit)
 {
 	char		buf[256];
-	char		*c;
 	unsigned int	i;
 
 	name = extractStringField (name, buf, sizeof (buf), attrp, bit);
@@ -52,7 +51,7 @@ extractUnsignedField (
 	if (!(*attrp & bit))
 		return name;
 	i = 0;
-	for (c = buf; *c; c++) {
+	for (char *c = buf; *c; c++) {
 		if (!isdigit (*c))
 			return NULL;
 		i = i * 10 + (*c - '0');
diff --git a/draw.c b/draw.c
index d5171c4..cf43985 100644
--- a/draw.c
+++ b/draw.c
@@ -106,11 +106,10 @@ VerticalGoto(DviWidget dw, int NewPosition)
 static void
 DrawText (DviWidget dw)
 {
-    int	    i;
     XftFont *font;
 
     font = dw->dvi.cache.font;
-    for (i = 0; i <= dw->dvi.cache.index; i++)
+    for (int i = 0; i <= dw->dvi.cache.index; i++)
     {
 	if (dw->dvi.cache.cache[i].font)
 	    font = dw->dvi.cache.cache[i].font;
@@ -154,11 +153,10 @@ FlushCharCache (DviWidget dw)
 void
 SetGCForDraw (DviWidget dw)
 {
-    int	lw;
     if (dw->dvi.state->line_style != dw->dvi.line_style ||
 	dw->dvi.state->line_width != dw->dvi.line_width)
     {
-	lw = ToX(dw, dw->dvi.state->line_width);
+	int lw = ToX(dw, dw->dvi.state->line_width);
 	if (lw <= 1)
 	    lw = 0;
 	XSetLineAttributes (XtDisplay (dw), dw->dvi.normal_GC,
@@ -212,8 +210,7 @@ ConvertAngle(int theta)
 void
 DrawArc (DviWidget dw, int x0, int y0, int x1, int y1)
 {
-    int	xc, yc, x2, y2, r;
-    int	angle1, angle2;
+    int	xc, yc, x2, y2;
 
     /* centre */
     xc = dw->dvi.state->x + x0;
@@ -227,9 +224,10 @@ DrawArc (DviWidget dw, int x0, int y0, int x1, int y1)
     dw->dvi.state->y = y2;
 
     if (dw->dvi.display_enable) {
+        int	angle1, angle2;
 
 	/* radius */
-	r = (int)sqrt((float) x1 * x1 + (float) y1 * y1);
+	int	r = (int)sqrt((float) x1 * x1 + (float) y1 * y1);
 
 	/* start and finish angles */
 	if (x0 == 0) {
@@ -321,7 +319,7 @@ DrawSpline (DviWidget dw, const char *s, int len)
 static int
 GetSpline(const char *s)
 {
-    double	x, y, x1, y1;
+    double	x, y;
     int		n = 0;
     Point	*pt;
     const char	*p = s;
@@ -335,6 +333,8 @@ GetSpline(const char *s)
     x = y = 0.0;
     p = s;
     while (p && *p) {
+	double	x1, y1;
+
 	if ((p = getstr(p, d)) == (const char *)NULL)
 	    break;
 	x1 = x + atof(d);
@@ -359,7 +359,7 @@ GetSpline(const char *s)
 static void
 ApproxSpline(int n)
 {
-    int		mid, j;
+    int		mid;
     Point	*p1, *p2, *p3, *p;
 
     if (n < 3)
@@ -371,6 +371,8 @@ ApproxSpline(int n)
     /* remember original points are stored as an array of n points */
     /* so I can index it directly to calculate mid-points only.	   */
     if (mid > 0) {
+	int	j;
+
 	p = spline->next;
 	j = 1;
 	while (j < n-2) {
@@ -409,12 +411,13 @@ ApproxSpline(int n)
 static void
 LineApprox(Point *p1, Point *p2, Point *p3)
 {
-    Point	*p4, *p;
     int		reps = ITERATIONS;
 
     while (reps) {
-	for (p = p1; p != (Point *)NULL && p != p3; ) {
-	    InsertPoint(p, p4 = MakePoint( midx(p,p->next), midy(p,p->next) ));
+	for (Point *p = p1; p != (Point *)NULL && p != p3; ) {
+	    Point	*p4 = MakePoint( midx(p,p->next), midy(p,p->next) );
+
+	    InsertPoint(p, p4);
 	    if (p != p1)
 		DeletePoint(p);
 	    p = p4->next;		/* skip inserted point! */
@@ -431,13 +434,11 @@ LineApprox(Point *p1, Point *p2, Point *p3)
 static void
 DrawSplineSegments(DviWidget dw)
 {
-    Point	*p, *q;
+    Point	*p;
     double	x1, y1;
-    int		dx, dy;
     double	xpos, ypos;
 
     p = spline;
-    dx = dy = 0;
 
     /* save the start position */
 
@@ -447,8 +448,8 @@ DrawSplineSegments(DviWidget dw)
     x1 = y1 = 0.0;
 
     while (p != (Point *)NULL) {
-	dx = p->x - x1 + 0.5;
-	dy = p->y - y1 + 0.5;
+	int	dx = p->x - x1 + 0.5;
+	int	dy = p->y - y1 + 0.5;
 	DrawLine (dw, dx, dy);
 
 	x1 = p->x;
@@ -456,7 +457,7 @@ DrawSplineSegments(DviWidget dw)
 	dw->dvi.state->x = xpos + x1;
 	dw->dvi.state->y = ypos + y1;
 
-	q = p;
+	Point 	*q = p;
 	p = p->next;
 	XtFree((char *)q);
     }
diff --git a/font.c b/font.c
index 031f9d3..1758387 100644
--- a/font.c
+++ b/font.c
@@ -40,15 +40,14 @@ LookupFontByPosition (DviWidget dw, int position)
 static DviFontSizeList *
 LookupFontSizeBySize (DviWidget dw, DviFontList *f, int size)
 {
-    DviFontSizeList *fs, *best = NULL;
-    int		    bestdist;
-    char	    fontNameString[2048];
-    XFontName	    fontName;
-    unsigned int    fontNameAttributes;
-    int		    dist;
+    DviFontSizeList	*best = NULL;
 
     if (f->scalable)
     {
+	char		fontNameString[2048];
+	XFontName	fontName;
+	unsigned int	fontNameAttributes;
+
 	for (best = f->sizes; best; best = best->next)
 	    if (best->size == size)
 		return best;
@@ -84,9 +83,10 @@ LookupFontSizeBySize (DviWidget dw, DviFontList *f, int size)
     }
     else
     {
-	bestdist = 65536;
-    	for (fs = f->sizes; fs; fs=fs->next) {
-	    dist = size - fs->size;
+	int 	bestdist = 65536;
+
+	for (DviFontSizeList *fs = f->sizes; fs; fs=fs->next) {
+	    int	dist = size - fs->size;
 	    if (dist < 0)
 		dist = -dist * 16;
 	    if (dist < bestdist)
@@ -130,8 +130,7 @@ ConvertFontNameToSize (char *n)
 static char *
 ConvertFontNameToEncoding (char *n)
 {
-        int i;
-	for (i = 0; i < EncodingPosition; i++) {
+	for (int i = 0; i < EncodingPosition; i++) {
 		n = SkipFontNameElement (n);
 		if (!n)
 			return NULL;
@@ -164,9 +163,7 @@ DisposeFontSizes (DviWidget dw, DviFontSizeList *fs)
 void
 ResetFonts (DviWidget dw)
 {
-    DviFontList	*f;
-    
-    for (f = dw->dvi.fonts; f; f = f->next)
+    for (DviFontList *f = dw->dvi.fonts; f; f = f->next)
     {
 	if (f->initialized)
 	{
@@ -191,9 +188,7 @@ InstallFontSizes (DviWidget dw, char *x_name, Boolean *scalablep)
 #ifndef USE_XFT
     char	    fontNameString[2048];
     char	    **fonts;
-    int		    i, count;
-    int		    size;
-    DviFontSizeList *new;
+    int		    count;
     XFontName	    fontName;
     unsigned int    fontNameAttributes;
 #endif
@@ -214,8 +209,9 @@ InstallFontSizes (DviWidget dw, char *x_name, Boolean *scalablep)
     fontName.ResolutionY = dw->dvi.screen_resolution;
     XFormatFontName (&fontName, fontNameAttributes, fontNameString);
     fonts = XListFonts (XtDisplay (dw), fontNameString, 10000000, &count);
-    for (i = 0; i < count; i++) {
-	size = ConvertFontNameToSize (fonts[i]);
+    for (int i = 0; i < count; i++) {
+	int	size = ConvertFontNameToSize (fonts[i]);
+
 	if (size == 0)
 	{
 	    DisposeFontSizes (dw, sizes);
@@ -224,7 +220,7 @@ InstallFontSizes (DviWidget dw, char *x_name, Boolean *scalablep)
 	    break;
 	}
 	if (size != -1) {
-	    new = (DviFontSizeList *) XtMalloc (sizeof *new);
+	    DviFontSizeList *new = (DviFontSizeList *) XtMalloc (sizeof *new);
 	    new->next = sizes;
 	    new->size = size;
 	    new->x_name = savestr (fonts[i]);
@@ -242,7 +238,6 @@ static DviFontList *
 InstallFont (DviWidget dw, int position, const char *dvi_name, const char *x_name)
 {
     DviFontList	*f;
-    const char	*encoding;
 
     f = LookupFontByPosition (dw, position);
     if (f) {
@@ -269,7 +264,7 @@ InstallFont (DviWidget dw, int position, const char *dvi_name, const char *x_nam
     f->sizes = NULL;
     f->scalable = FALSE;
     if (f->x_name) {
-	encoding = ConvertFontNameToEncoding (f->x_name);
+	const char *encoding = ConvertFontNameToEncoding (f->x_name);
 	f->char_map = DviFindMap (encoding);
     } else
 	f->char_map = NULL;
@@ -304,17 +299,18 @@ MapDviNameToXName (DviWidget dw, const char *dvi_name)
 void
 ParseFontMap (DviWidget dw)
 {
-    char		dvi_name[1024];
-    char		x_name[2048];
-    char		*m, *s;
-    DviFontMap	*fm, *new;
+    char	*m;
+    DviFontMap	*fm;
 
     if (dw->dvi.font_map)
 	    DestroyFontMap (dw->dvi.font_map);
     fm = NULL;
     m = dw->dvi.font_map_string;
     while (*m) {
-	s = m;
+	char		dvi_name[1024];
+	char		x_name[2048];
+
+	char *s = m;
 	while (*m && !isspace (*m))
 	    ++m;
 	strncpy (dvi_name, s, m-s);
@@ -326,7 +322,8 @@ ParseFontMap (DviWidget dw)
 	    ++m;
 	strncpy (x_name, s, m-s);
 	x_name[m-s] = '\0';
-	new = (DviFontMap *) XtMalloc (sizeof *new);
+
+	DviFontMap	*new = (DviFontMap *) XtMalloc (sizeof *new);
 	new->x_name = savestr (x_name);
 	new->dvi_name = savestr (dvi_name);
 	new->next = fm;
@@ -429,9 +426,7 @@ QueryFontMap (DviWidget dw, int position)
 unsigned char *
 DviCharIsLigature (DviCharNameMap *map, const char *name)
 {
-    int	    i;
-
-    for (i = 0; i < DVI_MAX_LIGATURES; i++) {
+    for (int i = 0; i < DVI_MAX_LIGATURES; i++) {
 	if (!map->ligatures[i][0])
 	    break;
 	if (!strcmp (name, map->ligatures[i][0]))
diff --git a/xditview.c b/xditview.c
index 3879e04..aef0b66 100644
--- a/xditview.c
+++ b/xditview.c
@@ -157,7 +157,6 @@ int
 main(int argc, char **argv)
 {
     char	    *file_name = NULL;
-    int		    i;
     XtAppContext    xtcontext;
     Arg		    topLevelArgs[2];
     Widget          entry;
@@ -194,7 +193,7 @@ main(int argc, char **argv)
      */
     popupMenu = XtCreatePopupShell ("popupMenu", simpleMenuWidgetClass, toplevel,
 				    NULL, 0);
-    for (i = 0; i < XtNumber (popupMenuEntries); i++) {
+    for (int i = 0; i < XtNumber (popupMenuEntries); i++) {
 	entry = XtCreateManagedWidget(popupMenuEntries[i].name, 
 				      smeBSBObjectClass, popupMenu,
 				      NULL, (Cardinal) 0);
@@ -209,7 +208,7 @@ main(int argc, char **argv)
 				    menuBar, NULL, (Cardinal) 0);
     fileMenu = XtCreatePopupShell ("fileMenu", simpleMenuWidgetClass,
 				    fileMenuButton, NULL, (Cardinal) 0);
-    for (i = 0; i < XtNumber (fileMenuEntries); i++) {
+    for (int i = 0; i < XtNumber (fileMenuEntries); i++) {
 	entry = XtCreateManagedWidget(fileMenuEntries[i].name,
 				      smeBSBObjectClass, fileMenu,
 				      NULL, (Cardinal) 0);