Use nul_array() for filenames

1 files changed, 4 insertions, 6 deletions

diff --git a/siv.c b/siv.c
index af13756..1bd6687 100644
--- a/siv.c
+++ b/siv.c
@@ -338,7 +338,7 @@ static char **
 process_options (int argc, char **argv)
 {
     int i;
-    GPtrArray *result = g_ptr_array_new ();
+    char **result = nul_array_new (char *);
 
     for (i = 1; i < argc; ++i)
     {
@@ -362,15 +362,13 @@ process_options (int argc, char **argv)
 	    else
 		name = g_build_filename (g_get_current_dir(), option, NULL);
 
-	    g_ptr_array_add (result, nul_canonicalize_filename (name));
+	    result = nul_array_append (result, nul_canonicalize_filename (name));
 
 	    g_free (name);
 	}
     }
 
-    g_ptr_array_add (result, NULL);
-
-    return (char **)g_ptr_array_free (result, FALSE);
+    return result;
 }
 
 static gboolean
@@ -479,7 +477,7 @@ app_new (int argc, char **argv)
 	window_show (window_new (app), NULL);
     }
 
-    g_strfreev (filenames);
+    nul_array_free (filenames);
     
     app_show_could_not_open (NULL, nul_array_len (err_files), err_files);