From 8de562cd70001c6138fe69c1736d338c63192922 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Mon, 5 May 2003 21:26:01 +0000
Subject: Found more problems.  Refix #112329.

Original commit message from CVS:
Found more problems.  Refix #112329.
---
 ext/aalib/gstaasink.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'ext/aalib')

diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c
index 6416b8da..49fad729 100644
--- a/ext/aalib/gstaasink.c
+++ b/ext/aalib/gstaasink.c
@@ -115,23 +115,20 @@ gst_aasink_drivers_get_type (void)
   if (!driver_type) {
     GEnumValue *drivers;
     const struct aa_driver *driver;
-    gint i = 0;
+    gint n_drivers;
+    gint i;
 
-    driver = aa_drivers[i++];
-    while (driver) {
-      driver = aa_drivers[i++];
+    for (n_drivers = 0; aa_drivers[n_drivers]; n_drivers++){
+      /* count number of drivers */
     }
     
-    drivers = g_new0(GEnumValue, i);
+    drivers = g_new0(GEnumValue, n_drivers + 1);
 
-    i = 0;
-    driver = aa_drivers[i];
-    while (driver) {
+    for (i = 0; i < n_drivers; i++){
+      driver = aa_drivers[i];
       drivers[i].value = i;
       drivers[i].value_name = g_strdup (driver->shortname);
       drivers[i].value_nick = g_strdup (driver->name);
-      i++;
-      driver = aa_drivers[i];
     }
     drivers[i].value = 0;
     drivers[i].value_name = NULL;
@@ -149,20 +146,19 @@ gst_aasink_dither_get_type (void)
   static GType dither_type = 0;
   if (!dither_type) {
     GEnumValue *ditherers;
-    gint i = 0;
+    gint n_ditherers;
+    gint i;
 
-    while (aa_dithernames[i]) {
-      i++;
+    for (n_ditherers = 0; aa_dithernames[n_ditherers]; n_ditherers++){
+      /* count number of ditherers */
     }
     
-    ditherers = g_new0(GEnumValue, i + 1);
+    ditherers = g_new0(GEnumValue, n_ditherers + 1);
 
-    i = 0;
-    while (aa_dithernames[i]) {
+    for (i = 0; i < n_ditherers; i++){
       ditherers[i].value = i;
       ditherers[i].value_name = g_strdup (aa_dithernames[i]);
       ditherers[i].value_nick = g_strdup (aa_dithernames[i]);
-      i++;
     }
     ditherers[i].value = 0;
     ditherers[i].value_name = NULL;
-- 
cgit