[tracker/sam/uncrustify: 5/8] style: Be consistent with GOptionEntry initializers

From: Sam Thursfield <sthursfield src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker/sam/uncrustify: 5/8] style: Be consistent with GOptionEntry initializers
Date: Fri, 19 Apr 2019 12:50:07 +0000 (UTC)
commit 0feae93a2656d68de24e4af81bbabbc428f47108
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Apr 17 20:58:54 2019 +0200

    style: Be consistent with GOptionEntry initializers
    
    We now never put a newline before the }. Previously we were
    inconsistent.
    
    This commit was created with Uncrustify.

 src/tracker/tracker-daemon.c | 38 +++++++++---------------
 src/tracker/tracker-info.c   | 24 +++++++--------
 src/tracker/tracker-search.c | 69 +++++++++++++++-----------------------------
 src/tracker/tracker-sparql.c | 39 +++++++++----------------
 src/tracker/tracker-sql.c    |  6 ++--
 src/tracker/tracker-status.c |  3 +-
 src/tracker/tracker-tag.c    | 24 +++++----------
 7 files changed, 71 insertions(+), 132 deletions(-)
---
diff --git a/src/tracker/tracker-daemon.c b/src/tracker/tracker-daemon.c
index 2c25b2c07..899541717 100644
--- a/src/tracker/tracker-daemon.c
+++ b/src/tracker/tracker-daemon.c
@@ -132,45 +132,35 @@ static GOptionEntry entries[] = {
        /* Status */
        { "follow", 'f', 0, G_OPTION_ARG_NONE, &follow,
          N_("Follow status changes as they happen"),
-         NULL
-       },
+         NULL },
        { "watch", 'w', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, parse_watch,
          N_("Watch changes to the database in real time (e.g. resources or files being added)"),
-         N_("ONTOLOGY")
-       },
+         N_("ONTOLOGY") },
        { "list-common-statuses", 0, 0, G_OPTION_ARG_NONE, &list_common_statuses,
          N_("List common statuses for miners and the store"),
-         NULL
-       },
+         NULL },
        /* Miners */
-       { "pause", 0 , 0, G_OPTION_ARG_STRING, &pause_reason,
+       { "pause", 0, 0, G_OPTION_ARG_STRING, &pause_reason,
          N_("Pause a miner (you must use this with --miner)"),
-         N_("REASON")
-       },
-       { "pause-for-process", 0 , 0, G_OPTION_ARG_STRING, &pause_for_process_reason,
+         N_("REASON") },
+       { "pause-for-process", 0, 0, G_OPTION_ARG_STRING, &pause_for_process_reason,
          N_("Pause a miner while the calling process is alive or until resumed (you must use this with 
--miner)"),
-         N_("REASON")
-       },
-       { "resume", 0 , 0, G_OPTION_ARG_INT, &resume_cookie,
+         N_("REASON") },
+       { "resume", 0, 0, G_OPTION_ARG_INT, &resume_cookie,
          N_("Resume a miner (you must use this with --miner)"),
-         N_("COOKIE")
-       },
-       { "miner", 0 , 0, G_OPTION_ARG_STRING, &miner_name,
+         N_("COOKIE") },
+       { "miner", 0, 0, G_OPTION_ARG_STRING, &miner_name,
          N_("Miner to use with --resume or --pause (you can use suffixes, e.g. Files or Applications)"),
-         N_("MINER")
-       },
+         N_("MINER") },
        { "list-miners-running", 0, 0, G_OPTION_ARG_NONE, &list_miners_running,
          N_("List all miners currently running"),
-         NULL
-       },
+         NULL },
        { "list-miners-available", 0, 0, G_OPTION_ARG_NONE, &list_miners_available,
          N_("List all miners installed"),
-         NULL
-       },
+         NULL },
        { "pause-details", 0, 0, G_OPTION_ARG_NONE, &pause_details,
          N_("List pause reasons"),
-         NULL
-       },
+         NULL },
        /* Processes */
        { "list-processes", 'p', 0, G_OPTION_ARG_NONE, &list_processes,
          N_("List all Tracker processes") },
diff --git a/src/tracker/tracker-info.c b/src/tracker/tracker-info.c
index 261d09061..897f8294d 100644
--- a/src/tracker/tracker-info.c
+++ b/src/tracker/tracker-info.c
@@ -47,26 +47,22 @@ static gboolean turtle;
 static GOptionEntry entries[] = {
        { "full-namespaces", 'f', 0, G_OPTION_ARG_NONE, &full_namespaces,
          N_("Show full namespaces (i.e. don’t use nie:title, use full URLs)"),
-         NULL,
-       },
+         NULL,},
        { "plain-text-content", 'c', 0, G_OPTION_ARG_NONE, &plain_text_content,
          N_("Show plain text content if available for resources"),
-         NULL,
-       },
+         NULL,},
        { "resource-is-iri", 'i', 0, G_OPTION_ARG_NONE, &resource_is_iri,
-         /* To translators:
-          * IRI (International Resource Identifier) is a generalization
-          * of the URI. While URI supports only ASCI encoding, IRI
-          * fully supports international characters. In practice, UTF-8
-          * is the most popular encoding used for IRI.
-          */
+               /* To translators:
+               * IRI (International Resource Identifier) is a generalization
+               * of the URI. While URI supports only ASCI encoding, IRI
+               * fully supports international characters. In practice, UTF-8
+               * is the most popular encoding used for IRI.
+               */
          N_("Instead of looking up a file name, treat the FILE arguments as actual IRIs (e.g. 
<file:///path/to/some/file.txt>)"),
-         NULL,
-       },
+         NULL,},
        { "turtle", 't', 0, G_OPTION_ARG_NONE, &turtle,
          N_("Output results as RDF in Turtle format"),
-         NULL,
-       },
+         NULL,},
        { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames,
          N_("FILE"),
          N_("FILE")},
diff --git a/src/tracker/tracker-search.c b/src/tracker/tracker-search.c
index 167d86679..0257a2370 100644
--- a/src/tracker/tracker-search.c
+++ b/src/tracker/tracker-search.c
@@ -78,101 +78,78 @@ static GOptionEntry entries[] = {
        /* Search types */
        { "files", 'f', 0, G_OPTION_ARG_NONE, &files,
          N_("Search for files"),
-         NULL
-       },
+         NULL},
        { "folders", 's', 0, G_OPTION_ARG_NONE, &folders,
          N_("Search for folders"),
-         NULL
-       },
+         NULL},
        { "music", 'm', 0, G_OPTION_ARG_NONE, &music_files,
          N_("Search for music files"),
-         NULL
-       },
+         NULL},
        { "music-albums", 0, 0, G_OPTION_ARG_NONE, &music_albums,
          N_("Search for music albums (--all has no effect on this)"),
-         NULL
-       },
+         NULL},
        { "music-artists", 0, 0, G_OPTION_ARG_NONE, &music_artists,
          N_("Search for music artists (--all has no effect on this)"),
-         NULL
-       },
+         NULL},
        { "images", 'i', 0, G_OPTION_ARG_NONE, &image_files,
          N_("Search for image files"),
-         NULL
-       },
+         NULL},
        { "videos", 'v', 0, G_OPTION_ARG_NONE, &video_files,
          N_("Search for video files"),
-         NULL
-       },
+         NULL},
        { "documents", 't', 0, G_OPTION_ARG_NONE, &document_files,
          N_("Search for document files"),
-         NULL
-       },
+         NULL},
        { "emails", 'e', 0, G_OPTION_ARG_NONE, &emails,
          N_("Search for emails"),
-         NULL
-       },
+         NULL},
        { "contacts", 'c', 0, G_OPTION_ARG_NONE, &contacts,
          N_("Search for contacts"),
-         NULL
-       },
+         NULL},
        { "software", 0, 0, G_OPTION_ARG_NONE, &software,
          N_("Search for software (--all has no effect on this)"),
-         NULL
-       },
+         NULL},
        { "software-categories", 0, 0, G_OPTION_ARG_NONE, &software_categories,
          N_("Search for software categories (--all has no effect on this)"),
-         NULL
-       },
+         NULL},
        { "feeds", 0, 0, G_OPTION_ARG_NONE, &feeds,
          N_("Search for feeds (--all has no effect on this)"),
-         NULL
-       },
+         NULL},
        { "bookmarks", 'b', 0, G_OPTION_ARG_NONE, &bookmarks,
          N_("Search for bookmarks (--all has no effect on this)"),
-         NULL
-       },
+         NULL},
 
        /* Semantic options */
        { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
          N_("Limit the number of results shown"),
-         "512"
-       },
+         "512"},
        { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
          N_("Offset the results"),
-         "0"
-       },
+         "0"},
        { "or-operator", 'r', 0, G_OPTION_ARG_NONE, &or_operator,
          N_("Use OR for search terms instead of AND (the default)"),
-         NULL
-       },
+         NULL},
        { "detailed", 'd', 0, G_OPTION_ARG_NONE, &detailed,
          N_("Show URNs for results (doesn’t apply to --music-albums, --music-artists, --feeds, --software, 
--software-categories)"),
-         NULL
-       },
+         NULL},
        { "all", 'a', 0, G_OPTION_ARG_NONE, &all,
          N_("Return all non-existing matches too (i.e. include unmounted volumes)"),
-         NULL
-       },
+         NULL},
        { "disable-snippets", 0, 0, G_OPTION_ARG_NONE, &disable_snippets,
          N_("Disable showing snippets with results. This is only shown for some categories, e.g. Documents, 
Music…"),
-         NULL,
-       },
+         NULL,},
        { "disable-fts", 0, 0, G_OPTION_ARG_NONE, &disable_fts,
          N_("Disable Full Text Search (FTS). Implies --disable-snippets"),
-         NULL,
-       },
+         NULL,},
        { "disable-color", 0, 0, G_OPTION_ARG_NONE, &disable_color,
          N_("Disable color when printing snippets and results"),
-         NULL,
-       },
+         NULL,},
 
        /* Main arguments, the search terms */
        { G_OPTION_REMAINING, 0, 0,
          G_OPTION_ARG_STRING_ARRAY, &terms,
          N_("search terms"),
-         N_("EXPRESSION")
-       },
+         N_("EXPRESSION")},
        { NULL }
 };
 
diff --git a/src/tracker/tracker-sparql.c b/src/tracker/tracker-sparql.c
index 0b4d2679a..9cbca3bea 100644
--- a/src/tracker/tracker-sparql.c
+++ b/src/tracker/tracker-sparql.c
@@ -103,56 +103,43 @@ static gchar *remote_url;
 static GOptionEntry entries[] = {
        { "file", 'f', 0, G_OPTION_ARG_FILENAME, &file,
          N_("Path to use to run a query or update from file"),
-         N_("FILE"),
-       },
+         N_("FILE"),},
        { "query", 'q', 0, G_OPTION_ARG_STRING, &query,
          N_("SPARQL query"),
-         N_("SPARQL"),
-       },
+         N_("SPARQL"),},
        { "update", 'u', 0, G_OPTION_ARG_NONE, &update,
          N_("This is used with --query and for database updates only."),
-         NULL,
-       },
+         NULL,},
        { "list-classes", 'c', 0, G_OPTION_ARG_NONE, &list_classes,
          N_("Retrieve classes"),
-         NULL,
-       },
+         NULL,},
        { "list-class-prefixes", 'x', 0, G_OPTION_ARG_NONE, &list_class_prefixes,
          N_("Retrieve class prefixes"),
-         NULL,
-       },
+         NULL,},
        { "list-properties", 'p', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, parse_list_properties,
          N_("Retrieve properties for a class, prefixes can be used too (e.g. rdfs:Resource)"),
-         N_("CLASS"),
-       },
+         N_("CLASS"),},
        { "list-notifies", 'n', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, parse_list_notifies,
          N_("Retrieve classes which notify changes in the database (CLASS is optional)"),
-         N_("CLASS"),
-       },
+         N_("CLASS"),},
        { "list-indexes", 'i', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, parse_list_indexes,
          N_("Retrieve indexes used in database to improve performance (PROPERTY is optional)"),
-         N_("PROPERTY"),
-       },
+         N_("PROPERTY"),},
        { "tree", 't', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, parse_tree,
          N_("Describe subclasses, superclasses (can be used with -s to highlight parts of the tree and -p to 
show properties)"),
-         N_("CLASS"),
-       },
+         N_("CLASS"),},
        { "search", 's', 0, G_OPTION_ARG_STRING, &search,
          N_("Search for a class or property and display more information (e.g. Document)"),
-         N_("CLASS/PROPERTY"),
-       },
+         N_("CLASS/PROPERTY"),},
        { "get-shorthand", 0, 0, G_OPTION_ARG_STRING, &get_shorthand,
          N_("Returns the shorthand for a class (e.g. nfo:FileDataObject)."),
-         N_("CLASS"),
-       },
+         N_("CLASS"),},
        { "get-longhand", 0, 0, G_OPTION_ARG_STRING, &get_longhand,
          N_("Returns the full namespace for a class."),
-         N_("CLASS"),
-       },
+         N_("CLASS"),},
        { "remote-service", 'r', 0, G_OPTION_ARG_STRING, &remote_url,
          N_("Remote service to query to"),
-         N_("BASE_URL"),
-       },
+         N_("BASE_URL"),},
        { NULL }
 };
 
diff --git a/src/tracker/tracker-sql.c b/src/tracker/tracker-sql.c
index 884388717..9415af83b 100644
--- a/src/tracker/tracker-sql.c
+++ b/src/tracker/tracker-sql.c
@@ -41,12 +41,10 @@ static gchar *query;
 static GOptionEntry entries[] = {
        { "file", 'f', 0, G_OPTION_ARG_FILENAME, &file,
          N_("Path to use to run a query from file"),
-         N_("FILE"),
-       },
+         N_("FILE"),},
        { "query", 'q', 0, G_OPTION_ARG_STRING, &query,
          N_("SQL query"),
-         N_("SQL"),
-       },
+         N_("SQL"),},
        { NULL }
 };
 
diff --git a/src/tracker/tracker-status.c b/src/tracker/tracker-status.c
index 3a5e28f7c..c7ba20bac 100644
--- a/src/tracker/tracker-status.c
+++ b/src/tracker/tracker-status.c
@@ -47,8 +47,7 @@ static gchar **terms;
 static GOptionEntry entries[] = {
        { "stat", 'a', 0, G_OPTION_ARG_NONE, &show_stat,
          N_("Show statistics for current index / data set"),
-         NULL
-       },
+         NULL},
        { "collect-debug-info", 0, 0, G_OPTION_ARG_NONE, &collect_debug_info,
          N_("Collect debug information useful for problem reporting and investigation, results are output to 
terminal"),
          NULL },
diff --git a/src/tracker/tracker-tag.c b/src/tracker/tracker-tag.c
index 78c511092..2a6fe9ddf 100644
--- a/src/tracker/tracker-tag.c
+++ b/src/tracker/tracker-tag.c
@@ -51,36 +51,28 @@ static gboolean show_resources;
 static GOptionEntry entries[] = {
        { "list", 't', 0, G_OPTION_ARG_NONE, &list,
          N_("List all tags (using FILTER if specified; FILTER always uses logical OR)"),
-         N_("FILTER"),
-       },
+         N_("FILTER"),},
        { "show-files", 's', 0, G_OPTION_ARG_NONE, &show_resources,
          N_("Show files associated with each tag (this is only used with --list)"),
-         NULL
-       },
+         NULL},
        { "add", 'a', 0, G_OPTION_ARG_STRING, &add_tag,
          N_("Add a tag (if FILEs are omitted, TAG is not associated with any files)"),
-         N_("TAG")
-       },
+         N_("TAG")},
        { "delete", 'd', 0, G_OPTION_ARG_STRING, &remove_tag,
          N_("Delete a tag (if FILEs are omitted, TAG is removed for all files)"),
-         N_("TAG")
-       },
+         N_("TAG")},
        { "description", 'e', 0, G_OPTION_ARG_STRING, &description,
          N_("Description for a tag (this is only used with --add)"),
-         N_("STRING")
-       },
+         N_("STRING")},
        { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
          N_("Limit the number of results shown"),
-         "512"
-       },
+         "512"},
        { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
          N_("Offset the results"),
-         "0"
-       },
+         "0"},
        { "and-operator", 'n', 0, G_OPTION_ARG_NONE, &and_operator,
          N_("Use AND for search terms instead of OR (the default)"),
-         NULL
-       },
+         NULL},
        { G_OPTION_REMAINING, 0, 0,
          G_OPTION_ARG_FILENAME_ARRAY, &resources,
          N_("FILE…"),
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]