Changeset 4d86e06 for dict.c

Timestamp:

Jul 23, 2009, 12:53:57 AM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ba6c8bd

Parents:

029a8b5

Message:

Get rid of a whole bunch of useless casts.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• dict.c (modified) (4 diffs)

dict.c

@@ -18 +18 @@
 int owl_dict_create(owl_dict *d) {
   d->size=0;
-  d->els=(owl_dict_el *)owl_malloc(INITSIZE*sizeof(owl_dict_el));
+  d->els=owl_malloc(INITSIZE*sizeof(owl_dict_el));
   d->avail=INITSIZE;
   if (d->els==NULL) return(-1);
@@ -61 +61 @@
   for (i=0; i<d->size; i++) {
     if ((dupk = owl_strdup(d->els[i].k)) == NULL) return(-1);
-    owl_list_append_element(l, (void*)dupk);
+    owl_list_append_element(l, dupk);
   }
   return(0);
@@ -95 +95 @@
     if (pos!=d->size) {
       /* shift forward to leave us a slot */
-      memmove((void*)(d->els+pos+1), (void*)(d->els+pos), 
+      memmove(d->els+pos+1, d->els+pos, 
               sizeof(owl_dict_el)*(d->size-pos));
     }
@@ -152 +152 @@
   printf("# BEGIN testing owl_dict\n");
   FAIL_UNLESS("create", 0==owl_dict_create(&d));
-  FAIL_UNLESS("insert b", 0==owl_dict_insert_element(&d, "b", (void*)bv, owl_dict_noop_free));
-  FAIL_UNLESS("insert d", 0==owl_dict_insert_element(&d, "d", (void*)dv, owl_dict_noop_free));
-  FAIL_UNLESS("insert a", 0==owl_dict_insert_element(&d, "a", (void*)av, owl_dict_noop_free));
-  FAIL_UNLESS("insert c", 0==owl_dict_insert_element(&d, "c", (void*)cv, owl_dict_noop_free));
-  FAIL_UNLESS("reinsert d (no replace)", -2==owl_dict_insert_element(&d, "d", (void*)dv, 0));
-  FAIL_UNLESS("find a", (void*)av==owl_dict_find_element(&d, "a"));
-  FAIL_UNLESS("find b", (void*)bv==owl_dict_find_element(&d, "b"));
-  FAIL_UNLESS("find c", (void*)cv==owl_dict_find_element(&d, "c"));
-  FAIL_UNLESS("find d", (void*)dv==owl_dict_find_element(&d, "d"));
+  FAIL_UNLESS("insert b", 0==owl_dict_insert_element(&d, "b", bv, owl_dict_noop_free));
+  FAIL_UNLESS("insert d", 0==owl_dict_insert_element(&d, "d", dv, owl_dict_noop_free));
+  FAIL_UNLESS("insert a", 0==owl_dict_insert_element(&d, "a", av, owl_dict_noop_free));
+  FAIL_UNLESS("insert c", 0==owl_dict_insert_element(&d, "c", cv, owl_dict_noop_free));
+  FAIL_UNLESS("reinsert d (no replace)", -2==owl_dict_insert_element(&d, "d", dv, 0));
+  FAIL_UNLESS("find a", av==owl_dict_find_element(&d, "a"));
+  FAIL_UNLESS("find b", bv==owl_dict_find_element(&d, "b"));
+  FAIL_UNLESS("find c", cv==owl_dict_find_element(&d, "c"));
+  FAIL_UNLESS("find d", dv==owl_dict_find_element(&d, "d"));
   FAIL_UNLESS("find e (non-existent)", NULL==owl_dict_find_element(&d, "e"));
-  FAIL_UNLESS("remove d", (void*)dv==owl_dict_remove_element(&d, "d"));
+  FAIL_UNLESS("remove d", dv==owl_dict_remove_element(&d, "d"));
   FAIL_UNLESS("find d (post-removal)", NULL==owl_dict_find_element(&d, "d"));