Fix "for loop initial declarations are only allowed in C99 mode" compile errors.

[ccan] / ccan / edit_distance / edit_distance_rdl.c

diff --git a/ccan/edit_distance/edit_distance_rdl.c b/ccan/edit_distance/edit_distance_rdl.c
index 76ba3ce23255f1e8f9ce8c799cc08a2e2491463a..9041448402e6b3a232b1c0586a79e10608bf79d6 100644 (file)
--- a/ccan/edit_distance/edit_distance_rdl.c
+++ b/ccan/edit_distance/edit_distance_rdl.c
@@ -13,14 +13,16 @@
 ed_dist edit_distance_rdl(const ed_elem *src, ed_size slen,
                          const ed_elem *tgt, ed_size tlen)
 {
+       ed_size i, j;
+
        /* Optimization: Avoid malloc when required rows of distance matrix can
         * fit on the stack.
         */
-       ed_dist stackdist[ED_STACK_ELEMS];
+       ed_dist stackdist[ED_STACK_DIST_VALS];
 
        /* Two rows of the Wagner-Fischer distance matrix. */
        ed_dist *distmem, *dist, *prevdist;
-       if (slen < ED_STACK_ELEMS / 2) {
+       if (slen < ED_STACK_DIST_VALS / 2) {
                distmem = stackdist;
                dist = distmem;
                prevdist = distmem + slen + 1;
@@ -32,11 +34,11 @@ ed_dist edit_distance_rdl(const ed_elem *src, ed_size slen,
 
        /* Initialize row with cost to delete src[0..i-1] */
        dist[0] = 0;
-       for (ed_size i = 1; i <= slen; ++i) {
+       for (i = 1; i <= slen; ++i) {
                dist[i] = dist[i - 1] + ED_DEL_COST(src[i - 1]);
        }
 
-       for (ed_size j = 1; j <= tlen; ++j) {
+       for (j = 1; j <= tlen; ++j) {
                /* Value for dist[j-2][i-1] (two rows up, one col left). */
                /* Note: dist[0] is not initialized when j == 1, var unused. */
                ed_dist diagdist1 = prevdist[0];
@@ -51,7 +53,7 @@ ed_dist edit_distance_rdl(const ed_elem *src, ed_size slen,
                /* Loop invariant: dist[i] is the edit distance between first j
                 * elements of tgt and first i elements of src.
                 */
-               for (ed_size i = 1; i <= slen; ++i) {
+               for (i = 1; i <= slen; ++i) {
                        ed_dist nextdiagdist = dist[i];
 
                        if (ED_ELEM_EQUAL(src[i - 1], tgt[j - 1])) {