[snappy] snappy: clean goto's in process_args
- From: Luis de Bethencourt <luisbg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [snappy] snappy: clean goto's in process_args
- Date: Thu, 3 May 2012 15:08:22 +0000 (UTC)
commit 6a7ac681ab96681ce3a50f999702938a1c1b48e3
Author: Luis de Bethencourt <luis debethencourt com>
Date: Thu May 3 16:02:37 2012 +0100
snappy: clean goto's in process_args
src/snappy.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/snappy.c b/src/snappy.c
index 69815a1..6f02010 100644
--- a/src/snappy.c
+++ b/src/snappy.c
@@ -104,7 +104,7 @@ process_args (int argc, char *argv[],
if (!g_option_context_parse (context, &argc, &argv, &err)) {
g_print ("Error initializing: %s\n", err->message);
g_error_free (err);
- goto quit;
+ return NULL;
}
/* Recently viewed uris */
@@ -122,19 +122,19 @@ process_args (int argc, char *argv[],
g_print ("%d: %s \n", c + 1, recent[c]);
}
- goto quit;
+ return NULL;
}
/* Show snappy's version */
if (version) {
g_print ("snappy version %s\n", VERSION);
- goto quit;
+ return NULL;
}
/* Check that at least one URI has been introduced */
if (argc < 2) {
g_print ("%s", g_option_context_get_help (context, TRUE, NULL));
- goto quit;
+ return NULL;
}
/* Save uris in the file glist */
@@ -145,9 +145,6 @@ process_args (int argc, char *argv[],
}
return file_list;
-
-quit:
- return NULL;
}
@@ -181,6 +178,8 @@ main (int argc, char *argv[])
/* Process command arguments */
file_list = process_args (argc, argv, &blind, &fullscreen, &hide,
&loop, &secret, &suburi, &tags, context);
+ if (file_list == NULL)
+ goto quit;
/* User Interface */
ui = g_new (UserInterface, 1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]