Initialize more variables in their declarations

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

6 files changed, 44 insertions, 69 deletions

diff --git a/Dvi.c b/Dvi.c
index 5cc88cb..96746b0 100644
--- a/Dvi.c
+++ b/Dvi.c
@@ -258,18 +258,17 @@ Realize(Widget w, XtValueMask * valueMask, XSetWindowAttributes *attrs)
                                   GCForeground, &values);
 #ifdef USE_XFT
     {
-        int scr;
-        Visual *visual;
-        Colormap cmap;
-        XRenderColor black;
-
-        scr = XScreenNumberOfScreen(dw->core.screen);
-        visual = DefaultVisual(XtDisplay(w), scr);
-        cmap = DefaultColormap(XtDisplay(w), scr);
+        int scr = XScreenNumberOfScreen(dw->core.screen);
+        Visual *visual = DefaultVisual(XtDisplay(w), scr);
+        Colormap cmap = DefaultColormap(XtDisplay(w), scr);
         dw->dvi.draw = XftDrawCreate(XtDisplay(w), XtWindow(w), visual, cmap);
 
-        black.red = black.green = black.blue = 0;
-        black.alpha = 0xffff;
+        XRenderColor black = {
+            .red = 0,
+            .green = 0,
+            .blue = 0,
+            .alpha = 0xffff
+        };
         XftColorAllocValue(XtDisplay(w), visual, cmap, &black, &dw->dvi.black);
         dw->dvi.default_font = XftFontOpenName(XtDisplay(w), scr, "serif-12");
     }
@@ -344,10 +343,9 @@ SetValues(Widget wcurrent, Widget wrequest, Widget wnew,
     DviWidget request = (DviWidget) wrequest;
     DviWidget new = (DviWidget) wnew;
     Boolean redisplay = FALSE;
-    int cur, req;
 
-    req = request->dvi.requested_page;
-    cur = current->dvi.requested_page;
+    int req = request->dvi.requested_page;
+    int cur = current->dvi.requested_page;
     if (cur != req) {
         if (req < 1)
             req = 1;
@@ -448,10 +446,9 @@ static XtGeometryResult
 QueryGeometry(Widget w, XtWidgetGeometry *request,
               XtWidgetGeometry *geometry_return)
 {
-    XtGeometryResult ret;
+    XtGeometryResult ret = XtGeometryYes;
     DviWidget dw = (DviWidget) w;
 
-    ret = XtGeometryYes;
     if ((int) request->width < dw->dvi.desired_width
         || (int) request->height < dw->dvi.desired_height)
         ret = XtGeometryAlmost;
diff --git a/DviChar.c b/DviChar.c
index efd1708..526b640 100644
--- a/DviChar.c
+++ b/DviChar.c
@@ -59,9 +59,8 @@ DviRegisterMap(DviCharNameMap *map)
 static void
 dispose_hash(DviCharNameMap *map)
 {
-    DviCharNameHash **buckets;
+    DviCharNameHash **buckets = map->buckets;
 
-    buckets = map->buckets;
     for (int i = 0; i < DVI_HASH_SIZE; i++) {
         DviCharNameHash *next;
 
@@ -87,9 +86,8 @@ hash_name(const char *name)
 static void
 compute_hash(DviCharNameMap *map)
 {
-    DviCharNameHash **buckets;
+    DviCharNameHash **buckets = map->buckets;
 
-    buckets = map->buckets;
     for (int i = 0; i < DVI_HASH_SIZE; i++) {
         buckets[i] = NULL;
     }
@@ -113,11 +111,9 @@ compute_hash(DviCharNameMap *map)
 int
 DviCharIndex(DviCharNameMap *map, const char *name)
 {
-    int i;
-    DviCharNameHash *h;
+    int i = hash_name(name) % DVI_HASH_SIZE;
 
-    i = hash_name(name) % DVI_HASH_SIZE;
-    for (h = map->buckets[i]; h; h = h->next) {
+    for (DviCharNameHash *h = map->buckets[i]; h; h = h->next) {
         if (!strcmp(h->name, name))
             return h->position;
     }
diff --git a/draw.c b/draw.c
index 78ff68c..877d7bf 100644
--- a/draw.c
+++ b/draw.c
@@ -82,9 +82,8 @@ static Point *  MakePoint(double x, double y);
 static void
 DrawText(DviWidget dw)
 {
-    XftFont *font;
+    XftFont *font = dw->dvi.cache.font;
 
-    font = dw->dvi.cache.font;
     for (int i = 0; i <= dw->dvi.cache.index; i++) {
         if (dw->dvi.cache.cache[i].font)
             font = dw->dvi.cache.cache[i].font;
@@ -101,10 +100,9 @@ DrawText(DviWidget dw)
 void
 FlushCharCache(DviWidget dw)
 {
-    int xx, yx;
+    int xx = ToX(dw, dw->dvi.state->x);
+    int yx = ToX(dw, dw->dvi.state->y);
 
-    xx = ToX(dw, dw->dvi.state->x);
-    yx = ToX(dw, dw->dvi.state->y);
     if (dw->dvi.cache.char_index != 0) {
 #ifdef USE_XFT
         DrawText(dw);
@@ -183,15 +181,13 @@ ConvertAngle(int theta)
 void
 DrawArc(DviWidget dw, int x0, int y0, int x1, int y1)
 {
-    int xc, yc, x2, y2;
-
     /* centre */
-    xc = dw->dvi.state->x + x0;
-    yc = dw->dvi.state->y + y0;
+    int xc = dw->dvi.state->x + x0;
+    int yc = dw->dvi.state->y + y0;
 
     /* to */
-    x2 = xc + x1;
-    y2 = yc + y1;
+    int x2 = xc + x1;
+    int y2 = yc + y1;
 
     dw->dvi.state->x = x2;
     dw->dvi.state->y = y2;
@@ -409,18 +405,13 @@ LineApprox(Point *p1, Point *p2, Point *p3)
 static void
 DrawSplineSegments(DviWidget dw)
 {
-    Point *p;
-    double x1, y1;
-    double xpos, ypos;
-
-    p = spline;
+    Point *p = spline;
 
     /* save the start position */
+    double xpos = dw->dvi.state->x;
+    double ypos = dw->dvi.state->y;
 
-    xpos = dw->dvi.state->x;
-    ypos = dw->dvi.state->y;
-
-    x1 = y1 = 0.0;
+    double x1 = 0.0, y1 = 0.0;
 
     while (p != (Point *) NULL) {
         int dx = p->x - x1 + 0.5;
@@ -447,9 +438,8 @@ DrawSplineSegments(DviWidget dw)
 static Point *
 MakePoint(double x, double y)
 {
-    Point *p;
+    Point *p = (Point *) XtMalloc(sizeof(Point));
 
-    p = (Point *) XtMalloc(sizeof(Point));
     p->x = x;
     p->y = y;
     p->next = (Point *) NULL;
@@ -474,9 +464,8 @@ InsertPoint(Point *p, Point *q)
 static void
 DeletePoint(Point *p)
 {
-    Point *tmp;
+    Point *tmp = p->next;
 
-    tmp = p->next;
     p->x = p->next->x;
     p->y = p->next->y;
     p->next = p->next->next;
diff --git a/font.c b/font.c
index 36e6776..afd4ab7 100644
--- a/font.c
+++ b/font.c
@@ -191,9 +191,8 @@ InstallFontSizes(DviWidget dw, char *x_name, Boolean *scalablep)
     XFontName fontName;
     unsigned int fontNameAttributes;
 #endif
-    DviFontSizeList *sizes;
+    DviFontSizeList *sizes = NULL;
 
-    sizes = NULL;
 #ifdef USE_XFT
     *scalablep = TRUE;
 #else
@@ -237,9 +236,8 @@ static DviFontList *
 InstallFont(DviWidget dw, int position, const char *dvi_name,
             const char *x_name)
 {
-    DviFontList *f;
+    DviFontList *f = LookupFontByPosition(dw, position);
 
-    f = LookupFontByPosition(dw, position);
     if (f) {
         /*
          * ignore gratuitous font loading
@@ -413,9 +411,8 @@ QueryFont(DviWidget dw, int position, int size)
 DviCharNameMap *
 QueryFontMap(DviWidget dw, int position)
 {
-    DviFontList *f;
+    DviFontList *f = LookupFontByPosition(dw, position);
 
-    f = LookupFontByPosition(dw, position);
     if (f)
         return f->char_map;
     else
diff --git a/page.c b/page.c
index a9876ce..6318f55 100644
--- a/page.c
+++ b/page.c
@@ -44,9 +44,9 @@ ForgetPagePositions(DviWidget dw)
 void
 RememberPagePosition(DviWidget dw, int number)
 {
-    DviFileMap *m;
+    DviFileMap *m = MapPageNumberToFileMap(dw, number);
 
-    if (!(m = MapPageNumberToFileMap(dw, number))) {
+    if (!m) {
         m = (DviFileMap *) XtMalloc(sizeof *m);
         m->page_number = number;
         m->next = dw->dvi.file_map;
@@ -61,9 +61,9 @@ RememberPagePosition(DviWidget dw, int number)
 long
 SearchPagePosition(DviWidget dw, int number)
 {
-    DviFileMap *m;
+    DviFileMap *m = MapPageNumberToFileMap(dw, number);
 
-    if (!(m = MapPageNumberToFileMap(dw, number)))
+    if (!m)
         return -1;
     return m->position;
 }
diff --git a/parse.c b/parse.c
index 504b0bd..26a222e 100644
--- a/parse.c
+++ b/parse.c
@@ -256,9 +256,8 @@ ParseInput(DviWidget dw)
 static void
 push_env(DviWidget dw)
 {
-    DviState *new;
-
-    new = (DviState *) XtMalloc(sizeof(*new));
+    DviState *new = (DviState *) XtMalloc(sizeof(*new));
+    
     if (dw->dvi.state)
         *new = *(dw->dvi.state);
     else {
@@ -276,9 +275,7 @@ push_env(DviWidget dw)
 static void
 pop_env(DviWidget dw)
 {
-    DviState *old;
-
-    old = dw->dvi.state;
+    DviState *old = dw->dvi.state;
     dw->dvi.state = old->next;
     XtFree((char *) old);
 }
@@ -306,14 +303,13 @@ SetFont(DviWidget dw)
 static void
 PutCharacters(DviWidget dw, unsigned char *src, int len)
 {
-    int xx, yx;
-    int fx, fy;
     char *dst;
 
-    xx = ToX(dw, dw->dvi.state->x);
-    yx = ToX(dw, dw->dvi.state->y);
-    fy = FontSizeInPixels(dw, dw->dvi.state->font_size);
-    fx = fy * len;
+    int xx = ToX(dw, dw->dvi.state->x);
+    int yx = ToX(dw, dw->dvi.state->y);
+    int fy = FontSizeInPixels(dw, dw->dvi.state->font_size);
+    int fx = fy * len;
+
     /*
      * quick and dirty extents calculation:
      */