--- a/cinst/main.c	Fri Mar 21 17:13:24 2014 +0100
+++ b/cinst/main.c	Fri Mar 21 17:42:00 2014 +0100
@@ -92,17 +92,17 @@
         }
         if (*buf == 'I') {
             /* Remove leading I: and trailing \r\n */
-            array_append_str(to_install, buf+2, len - 4);
+            strv_append(to_install, buf+2, len - 4);
             continue;
         }
         if (*buf == 'R') {
             /* Remove leading R: and trailing \r\n */
-            array_append_str(to_remove, buf+2, len - 4);
+            strv_append(to_remove, buf+2, len - 4);
             continue;
         }
         if (strcmp("UNINSTALL", buf) == 0) {
             /* Remove trailing \r\n */
-            array_append_str(to_remove, buf, len - 2);
+            strv_append(to_remove, buf, len - 2);
         }
     }
 
@@ -255,8 +255,8 @@
 #endif
 
     /* Make valgrind happy */
-    strfreev(to_install);
-    strfreev(to_remove);
+    strv_free(to_install);
+    strv_free(to_remove);
     free(certificate_list);
 
     return 0;