[snappy] snappy: clean process_args to return file_list
- From: Luis de Bethencourt <luisbg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [snappy] snappy: clean process_args to return file_list
- Date: Thu, 3 May 2012 14:16:50 +0000 (UTC)
commit 393e82079943325798c1c89c8b6194b7252e2482
Author: Luis de Bethencourt <luis debethencourt com>
Date: Thu May 3 15:13:33 2012 +0100
snappy: clean process_args to return file_list
src/snappy.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/snappy.c b/src/snappy.c
index 043bdde..69815a1 100644
--- a/src/snappy.c
+++ b/src/snappy.c
@@ -63,14 +63,16 @@ close_down (UserInterface * ui, GstEngine * engine)
/* Process command arguments */
-gboolean
+GList *
process_args (int argc, char *argv[],
- GList ** file_list, gboolean * blind, gboolean * fullscreen,
- gboolean * hide, gboolean * loop, gboolean * secret, gchar ** suburi,
- gboolean * tags, GOptionContext * context)
+ gboolean * blind, gboolean * fullscreen, gboolean * hide, gboolean * loop,
+ gboolean * secret, gchar ** suburi, gboolean * tags,
+ GOptionContext * context)
{
gboolean recent = FALSE, version = FALSE;
guint c, index, pos = 0;
+ GList * file_list = NULL;
+
GOptionEntry entries[] = {
{"blind", 'b', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, blind,
"Blind mode", NULL},
@@ -137,15 +139,15 @@ process_args (int argc, char *argv[],
/* Save uris in the file glist */
for (index = 1; index < argc; index++) {
- *file_list = g_list_append (*file_list, argv[index]);
+ file_list = g_list_append (file_list, argv[index]);
g_debug ("Adding file: %s\n", argv[index]);
pos++;
}
- return TRUE;
+ return file_list;
quit:
- return FALSE;
+ return NULL;
}
@@ -164,7 +166,7 @@ main (int argc, char *argv[])
guint c, index, pos = 0;
gchar *uri;
gchar *suburi = NULL;
- GList *file_list = NULL;
+ GList *file_list;
GOptionContext *context;
#ifdef ENABLE_DBUS
@@ -177,10 +179,8 @@ main (int argc, char *argv[])
context = g_option_context_new ("<media file> - Play movie files");
/* Process command arguments */
- ok = process_args (argc, argv, &file_list, &blind, &fullscreen, &hide, &loop,
- &secret, &suburi, &tags, context);
- if (!ok)
- goto quit;
+ file_list = process_args (argc, argv, &blind, &fullscreen, &hide,
+ &loop, &secret, &suburi, &tags, context);
/* User Interface */
ui = g_new (UserInterface, 1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]