Use C99 designated initializers when possible

Author: jserv

src/font.c

@@ -186,9 +186,7 @@ static twin_path_t *_twin_text_compute_pen(twin_text_info_t *info)
 
 static twin_fixed_t _twin_snap(twin_fixed_t v, twin_fixed_t *snap, int n)
 {
-    int s;
-
-    for (s = 0; s < n - 1; s++) {
+    for (int s = 0; s < n - 1; s++) {
         if (snap[s] <= v && v <= snap[s + 1]) {
             twin_fixed_t before = snap[s];
             twin_fixed_t after = snap[s + 1];

src/path.c

@@ -410,10 +410,7 @@ void twin_path_bounds(twin_path_t *path, twin_rect_t *rect)
 
 void twin_path_append(twin_path_t *dst, twin_path_t *src)
 {
-    int p;
-    int s = 0;
-
-    for (p = 0; p < src->npoints; p++) {
+    for (int p = 0, s = 0; p < src->npoints; p++) {
         if (s < src->nsublen && p == src->sublen[s]) {
             _twin_path_sfinish(dst);
             s++;
@@ -463,33 +460,26 @@ void twin_composite_path(twin_pixmap_t *dst,
                          twin_operator_t operator)
 {
     twin_rect_t bounds;
-    twin_pixmap_t *mask;
-    twin_operand_t msk;
-    twin_coord_t width, height;
-
     twin_path_bounds(path, &bounds);
     if (bounds.left >= bounds.right || bounds.top >= bounds.bottom)
         return;
-    width = bounds.right - bounds.left;
-    height = bounds.bottom - bounds.top;
-    mask = twin_pixmap_create(TWIN_A8, width, height);
 
+    twin_coord_t width = bounds.right - bounds.left;
+    twin_coord_t height = bounds.bottom - bounds.top;
+    twin_pixmap_t *mask = twin_pixmap_create(TWIN_A8, width, height);
     if (!mask)
         return;
+
     twin_fill_path(mask, path, -bounds.left, -bounds.top);
-    msk.source_kind = TWIN_PIXMAP;
-    msk.u.pixmap = mask;
+    twin_operand_t msk = {.source_kind = TWIN_PIXMAP, .u.pixmap = mask};
     twin_composite(dst, bounds.left, bounds.top, src, src_x + bounds.left,
                    src_y + bounds.top, &msk, 0, 0, operator, width, height);
     twin_pixmap_destroy(mask);
 }
 
 void twin_paint_path(twin_pixmap_t *dst, twin_argb32_t argb, twin_path_t *path)
 {
-    twin_operand_t src;
-
-    src.source_kind = TWIN_SOLID;
-    src.u.argb = argb;
+    twin_operand_t src = {.source_kind = TWIN_SOLID, .u.argb = argb};
     twin_composite_path(dst, &src, 0, 0, path, TWIN_OVER);
 }
 
@@ -521,9 +511,6 @@ void twin_paint_stroke(twin_pixmap_t *dst,
                        twin_path_t *stroke,
                        twin_fixed_t pen_width)
 {
-    twin_operand_t src;
-
-    src.source_kind = TWIN_SOLID;
-    src.u.argb = argb;
+    twin_operand_t src = {.source_kind = TWIN_SOLID, .u.argb = argb};
     twin_composite_stroke(dst, &src, 0, 0, stroke, pen_width, TWIN_OVER);
 }

src/poly.c

@@ -305,13 +305,11 @@ void twin_fill_path(twin_pixmap_t *pixmap,
     int nedges = 0;
     for (int s = 0; s <= path->nsublen; s++) {
         int sublen;
-        int npoints;
-
         if (s == path->nsublen)
             sublen = path->npoints;
         else
             sublen = path->sublen[s];
-        npoints = sublen - p;
+        int npoints = sublen - p;
         if (npoints > 1) {
             int n =
                 _twin_edge_build(path->points + p, npoints, edges + nedges, sdx,

src/queue.c

@@ -61,9 +61,8 @@ void _twin_queue_delete(twin_queue_t **head, twin_queue_t *old)
 twin_queue_t *_twin_queue_set_order(twin_queue_t **head)
 {
     twin_queue_t *first = *head;
-    twin_queue_t *q;
 
-    for (q = first; q; q = q->next) {
+    for (twin_queue_t *q = first; q; q = q->next) {
         q->order = q->next;
         q->walking = true;
     }

src/toplevel.c

@@ -84,11 +84,11 @@ twin_toplevel_t *twin_toplevel_create(twin_screen_t *screen,
         twin_window_create(screen, format, style, x, y, width, height);
 
     if (!window)
-        return 0;
+        return NULL;
     toplevel = malloc(sizeof(twin_toplevel_t) + strlen(name) + 1);
     if (!toplevel) {
         twin_window_destroy(window);
-        return 0;
+        return NULL;
     }
     _twin_toplevel_init(toplevel, _twin_toplevel_dispatch, window, name);
     return toplevel;

src/trig.c

@@ -59,7 +59,7 @@ static inline twin_fixed_t sin_poly(twin_angle_t x)
     y = x * (y >> n);
     y = A1 - (y >> (p - q));
     y = x * (y >> n);
-    y = (y + (1UL << (q - A - 1))) >> (q - A);  // Rounding
+    y = (y + (1UL << (q - A - 1))) >> (q - A); /* Rounding */
     return y;
 }
 

src/widget.c

@@ -16,13 +16,14 @@ static twin_path_t *_twin_path_shape(twin_shape_t shape,
                                      twin_fixed_t radius)
 {
     twin_path_t *path = twin_path_create();
+    if (!path)
+        return NULL;
+
     twin_fixed_t x = twin_int_to_fixed(left);
     twin_fixed_t y = twin_int_to_fixed(top);
     twin_fixed_t w = twin_int_to_fixed(right - left);
     twin_fixed_t h = twin_int_to_fixed(bottom - top);
 
-    if (!path)
-        return 0;
     switch (shape) {
     case TwinShapeRectangle:
         twin_path_rectangle(path, x, y, w, h);