Changeset 808

Timestamp:

12/19/10 07:28:15 (14 years ago)

Author:

walter

Message:

fix 2 issues spotted by valgrind

Files:

• branches/dmd-1.x/src/root/aav.c (modified) (1 diff)
• branches/dmd-1.x/src/root/array.c (modified) (1 diff)
• trunk/src/root/aav.c (modified) (1 diff)
• trunk/src/root/array.c (modified) (1 diff)

branches/dmd-1.x/src/root/aav.c

@@ -144 +144 @@
-            {
-                if (len <= prime_list[i])
-                    break;
-            }
-            len = prime_list[i];
-            newb.b = new aaA*[len];
-            memset(newb.b, 0, len * sizeof(aaA*));
-            newb.b_length = len;
-
-            for (size_t k = 0; k < aa->b_length; k++)
-            {   aaA *e = aa->b[k];
-                while (e)
-                {   aaA* enext = e->next;
-                    size_t j = (size_t)e->key % len;
-                    e->next = newb.b[j];
-                    newb.b[j] = e;
-                    e = enext;
-                }
-            }
-            if (aa->b != aa->binit)
-
+[]
-
-            newb.nodes = aa->nodes;
-        }
-
-        **paa = newb;
-    }
-}
-
-
-#if UNITTEST
-
-void unittest_aa()
-{
-    AA* aa = NULL;
-    Value v = _aaGetRvalue(aa, NULL);
-    assert(!v);
-    Value *pv = _aaGet(&aa, NULL);
-    assert(pv);
-    *pv = (void *)3;
-    v = _aaGetRvalue(aa, NULL);

branches/dmd-1.x/src/root/array.c

@@ -160 +160 @@
-        reserve(d);
-        if (dim != index)
-            memmove(data + index + d, data + index, (dim - index) * sizeof(*data));
-        memcpy(data + index, a->data, d * sizeof(*data));
-        dim += d;
-    }
-}
-
-
-/***********************************
- * Append array a to this array.
- */
-
-void Array::append(Array *a)
-{
-    insert(dim, a);
-}
-
-void Array::remove(unsigned i)
-{
-
+
+
-    dim--;
-}
-
-char *Array::toChars()
-{
-    unsigned len;
-    unsigned u;
-    char **buf;
-    char *str;
-    char *p;
-
-    buf = (char **)alloca(dim * sizeof(char *));
-    len = 2;
-    for (u = 0; u < dim; u++)
-    {
-        buf[u] = ((Object *)data[u])->toChars();
-        len += strlen(buf[u]) + 1;
-    }
-    str = (char *)mem.malloc(len);
-

trunk/src/root/aav.c

@@ -144 +144 @@
-            {
-                if (len <= prime_list[i])
-                    break;
-            }
-            len = prime_list[i];
-            newb.b = new aaA*[len];
-            memset(newb.b, 0, len * sizeof(aaA*));
-            newb.b_length = len;
-
-            for (size_t k = 0; k < aa->b_length; k++)
-            {   aaA *e = aa->b[k];
-                while (e)
-                {   aaA* enext = e->next;
-                    size_t j = (size_t)e->key % len;
-                    e->next = newb.b[j];
-                    newb.b[j] = e;
-                    e = enext;
-                }
-            }
-            if (aa->b != aa->binit)
-
+[]
-
-            newb.nodes = aa->nodes;
-        }
-
-        **paa = newb;
-    }
-}
-
-
-#if UNITTEST
-
-void unittest_aa()
-{
-    AA* aa = NULL;
-    Value v = _aaGetRvalue(aa, NULL);
-    assert(!v);
-    Value *pv = _aaGet(&aa, NULL);
-    assert(pv);
-    *pv = (void *)3;
-    v = _aaGetRvalue(aa, NULL);

trunk/src/root/array.c

@@ -160 +160 @@
-        reserve(d);
-        if (dim != index)
-            memmove(data + index + d, data + index, (dim - index) * sizeof(*data));
-        memcpy(data + index, a->data, d * sizeof(*data));
-        dim += d;
-    }
-}
-
-
-/***********************************
- * Append array a to this array.
- */
-
-void Array::append(Array *a)
-{
-    insert(dim, a);
-}
-
-void Array::remove(unsigned i)
-{
-
+
+
-    dim--;
-}
-
-char *Array::toChars()
-{
-    unsigned len;
-    unsigned u;
-    char **buf;
-    char *str;
-    char *p;
-
-    buf = (char **)alloca(dim * sizeof(char *));
-    len = 2;
-    for (u = 0; u < dim; u++)
-    {
-        buf[u] = ((Object *)data[u])->toChars();
-        len += strlen(buf[u]) + 1;
-    }
-    str = (char *)mem.malloc(len);
-