# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1504053352 -10800
# Node ID 28fe5b0925dc73ccd263a83e5d8b92b3e7d2be42
# Parent  569cf7419f031737cb89b283ab05e699058e0683
Cleanups.

diff -r 569cf7419f03 -r 28fe5b0925dc src/dmtimeline.c
--- a/src/dmtimeline.c	Fri Aug 25 00:17:07 2017 +0300
+++ b/src/dmtimeline.c	Wed Aug 30 03:35:52 2017 +0300
@@ -21,7 +21,6 @@
 
 static int dmLoadTimelinePoints(DMResource *res, DMTimelinePoints *points, int type)
 {
-    int point;
     Uint32 npoints;
 
     // Get number of points
@@ -37,7 +36,7 @@
         return DMERR_MALLOC;
 
     // Read points
-    for (point = 0; point < points->npoints; point++)
+    for (int point = 0; point < points->npoints; point++)
     {
         DMTimelinePoint *pt = &(points->points[point]);
         Uint32 ptype, ptime;
@@ -132,7 +131,6 @@
 
 static int dmLoadTimelineEvent(DMResource *res, DMTimelineEvent **pevent)
 {
-    int param;
     DMFTimelineEvent hdr;
     DMTimelineEvent *event;
     if ((*pevent = event = dmMalloc0(sizeof(DMTimelineEvent))) == NULL)
@@ -172,7 +170,7 @@
             "Could not allocate memory for timeline event parameters.\n");
     }
 
-    for (param = 0; param < event->nparams; param++)
+    for (int param = 0; param < event->nparams; param++)
     {
         int err;
         if ((err = dmLoadTimelineEventParam(res, &(event->params[param]))) != DMERR_OK)
@@ -197,7 +195,7 @@
 
 static int dmLoadTimelineTrack(DMResource *res, DMTimelineTrack **ptrack)
 {
-    int event, err;
+    int err;
     DMFTimelineTrack hdr;
     DMTimelineTrack *track;
     if ((*ptrack = track = dmMalloc0(sizeof(DMTimelineTrack))) == NULL)
@@ -221,7 +219,7 @@
     track->enabled = hdr.enabled;
     track->nevents = hdr.nevents;
 
-    for (event = 0; event < track->nevents; event++)
+    for (int event = 0; event < track->nevents; event++)
     {
         if ((err = dmLoadTimelineEvent(res, &(track->events[event]))) != DMERR_OK)
             return err;
@@ -236,9 +234,10 @@
 
 int dmLoadTimeline(DMResource *res, DMTimeline **ptl)
 {
-    int track, err;
+    int err;
     DMFTimeline hdr;
     DMTimeline *tl;
+
     if ((*ptl = tl = dmMalloc0(sizeof(DMTimeline))) == NULL)
         return DMERR_MALLOC;
 
@@ -269,7 +268,7 @@
     tl->ntracks  = hdr.ntracks;
 
     // Read tracks
-    for (track = 0; track < tl->ntracks; track++)
+    for (int track = 0; track < tl->ntracks; track++)
     {
         if ((err = dmLoadTimelineTrack(res, &(tl->tracks[track]))) != DMERR_OK)
             return err;
@@ -299,8 +298,7 @@
 {
     if (event != NULL)
     {
-        int param;
-        for (param = 0; param < event->nparams; param++)
+        for (int param = 0; param < event->nparams; param++)
             dmFreeTimelineEventParam(&(event->params[param]));
         dmFree(event->params);
     }
@@ -311,12 +309,11 @@
 {
     if (track != NULL)
     {
-        int event;
-
         dmFree(track->name);
 
-        for (event = 0; event < track->nevents; event++)
+        for (int event = 0; event < track->nevents; event++)
             dmFreeTimelineEvent(track->events[event]);
+
         dmFree(track->events);
 
         dmFreeTimelinePoints(&(track->composite.points));
@@ -328,9 +325,8 @@
 {
     if (tl != NULL)
     {
-        int i;
-        for (i = 0; i < tl->ntracks; i++)
-            dmFreeTimelineTrack(tl->tracks[i]);
+        for (int track = 0; track < tl->ntracks; track++)
+            dmFreeTimelineTrack(tl->tracks[track]);
 
         dmFree(tl->tracks);
         dmFree(tl->name);
@@ -352,8 +348,7 @@
 {
     if (ptl != NULL)
     {
-        int group;
-        for (group = 0; group < ptl->ngroups; group++)
+        for (int group = 0; group < ptl->ngroups; group++)
         {
             dmFreePreparedEventGroup(ptl->groups[group]);
             ptl->groups[group] = NULL;