Signed-off-by: Giuseppe Scrivano <gscrivan@xxxxxxxxxx>
---
tools/osinfo-db-validate.c | 8 ++++----
tools/osinfo-detect.c | 14 +++++++-------
tools/osinfo-install-script.c | 8 ++++----
tools/osinfo-query.c | 24 ++++++++++++------------
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index 20a77c2..f53aebe 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -227,7 +227,7 @@ static gboolean validate_files(gint argc, gchar **argv, GError **error)
goto cleanup;
}
- for (i = 0 ; i < argc ; i++) {
+ for (i = 0; i < argc; i++) {
GFile *file = g_file_new_for_commandline_arg(argv[i]);
if (!validate_file(rngValid, file, NULL, error)) {
g_object_unref(file);
@@ -252,9 +252,9 @@ gint main(gint argc, gchar **argv)
gint ret = EXIT_FAILURE;
setlocale(LC_ALL, "");
- textdomain (GETTEXT_PACKAGE);
+ textdomain(GETTEXT_PACKAGE);
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
#if !GLIB_CHECK_VERSION(2,35,1)
g_type_init();
@@ -333,7 +333,7 @@ Daniel P. Berrange <berrange@xxxxxxxxxx>
=head1 COPYRIGHT
-Copyright (C) 2012 Red Hat, Inc.
+Copyright (C) 2012, 2014 Red Hat, Inc.
=head1 LICENSE
diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c
index cf737f2..fae7b21 100644
--- a/tools/osinfo-detect.c
+++ b/tools/osinfo-detect.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Red Hat, Inc.
+ * Copyright (C) 2011, 2014 Red Hat, Inc.
*
* osinfo-detect: Given a path to a ISO9660 image/device, detects if media is
* bootable and the relevant OS if media is an installer for it.
@@ -129,9 +129,9 @@ static void print_media(OsinfoMedia *media)
if (format == OUTPUT_FORMAT_ENV) {
const gchar *id = osinfo_entity_get_id(OSINFO_ENTITY(os));
- if (osinfo_media_get_installer (media))
+ if (osinfo_media_get_installer(media))
g_print("OSINFO_INSTALLER=%s\n", id);
- if (osinfo_media_get_live (media))
+ if (osinfo_media_get_live(media))
g_print("OSINFO_LIVE=%s\n", id);
g_print("OSINFO_MEDIA=%s\n",
osinfo_entity_get_id(OSINFO_ENTITY(media)));
@@ -151,9 +151,9 @@ static void print_media(OsinfoMedia *media)
name = osinfo_product_get_name(OSINFO_PRODUCT(os));
}
- if (osinfo_media_get_installer (media))
+ if (osinfo_media_get_installer(media))
g_print(_("Media is an installer for OS '%s'\n"), name);
- if (osinfo_media_get_live (media))
+ if (osinfo_media_get_live(media))
g_print(_("Media is live media for OS '%s'\n"), name);
if (num_variants > 1) {
@@ -217,9 +217,9 @@ gint main(gint argc, gchar **argv)
gint ret = 0;
setlocale(LC_ALL, "");
- textdomain (GETTEXT_PACKAGE);
+ textdomain(GETTEXT_PACKAGE);
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
context = g_option_context_new(_("- Detect if media is bootable " \
"and the relevant OS and distribution."));
diff --git a/tools/osinfo-install-script.c b/tools/osinfo-install-script.c
index 4191629..9f9894a 100644
--- a/tools/osinfo-install-script.c
+++ b/tools/osinfo-install-script.c
@@ -148,7 +148,7 @@ static gboolean list_script_config(OsinfoOs *os)
GList *params = osinfo_install_script_get_config_param_list(script);
GList *tmp2;
- for (tmp2 = params ; tmp2 != NULL ; tmp2 = tmp2->next) {
+ for (tmp2 = params; tmp2 != NULL; tmp2 = tmp2->next) {
OsinfoInstallConfigParam *param = OSINFO_INSTALL_CONFIG_PARAM(tmp2->data);
g_print("%s: %s\n",
@@ -265,7 +265,7 @@ static gboolean generate_script(OsinfoOs *os)
goto cleanup;
}
if (!quiet)
- g_print ("%s\n", osinfo_install_script_get_output_filename(script));
+ g_print("%s\n", osinfo_install_script_get_output_filename(script));
}
ret = TRUE;
@@ -290,9 +290,9 @@ gint main(gint argc, gchar **argv)
gint ret = 0;
setlocale(LC_ALL, "");
- textdomain (GETTEXT_PACKAGE);
+ textdomain(GETTEXT_PACKAGE);
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
#if !GLIB_CHECK_VERSION(2,35,1)
g_type_init();
diff --git a/tools/osinfo-query.c b/tools/osinfo-query.c
index 8ceba3f..43ded4f 100644
--- a/tools/osinfo-query.c
+++ b/tools/osinfo-query.c
@@ -136,13 +136,13 @@ static gboolean toggle_fields(struct OsinfoLabel *labels,
fields = g_strsplit(fieldStr, ",", 0);
- for (j = 0 ; labels[j].prop ; j++) {
+ for (j = 0; labels[j].prop; j++) {
labels[j].enabled = FALSE;
}
- for (i = 0 ; fields[i] != NULL ; i++) {
+ for (i = 0; fields[i] != NULL; i++) {
gboolean found = FALSE;
- for (j = 0 ; labels[j].prop ; j++) {
+ for (j = 0; labels[j].prop; j++) {
if (g_str_equal(fields[i], labels[j].prop)) {
labels[j].enabled = TRUE;
found = TRUE;
@@ -171,7 +171,7 @@ static gboolean build_filter(struct OsinfoLabel *labels,
gboolean ret = FALSE;
gsize i, j;
- for (i = 0 ; i < argc ; i++) {
+ for (i = 0; i < argc; i++) {
const gchar *tmp = strchr(argv[i], '=');
if (!tmp) {
g_set_error(error, 0, 0, "%s", _("Syntax error in condition, expecting KEY=VALUE"));
@@ -181,7 +181,7 @@ static gboolean build_filter(struct OsinfoLabel *labels,
gchar *val = g_strdup(tmp+1);
gboolean found = FALSE;
- for (j = 0 ; labels[j].prop != NULL ; j++) {
+ for (j = 0; labels[j].prop != NULL; j++) {
if (g_str_equal(key, labels[j].prop))
found = TRUE;
}
@@ -234,7 +234,7 @@ static gboolean print_entity_text(OsinfoEntity *entity,
{
gsize i;
gboolean first = TRUE;
- for (i = 0 ; labels[i].prop != NULL ; i++) {
+ for (i = 0; labels[i].prop != NULL; i++) {
gsize pad;
gchar *padstr;
const gchar *val = osinfo_entity_get_param_value(entity, labels[i].prop);
@@ -281,7 +281,7 @@ static gboolean print_results_text(OsinfoList *list,
(gchar*)(sortKey ? sortKey :
labels[0].prop));
- for (i = 0 ; labels[i].prop != NULL ; i++) {
+ for (i = 0; labels[i].prop != NULL; i++) {
gsize pad;
gchar *padstr;
if (!labels[i].enabled)
@@ -311,7 +311,7 @@ static gboolean print_results_text(OsinfoList *list,
g_print("\n");
first = TRUE;
- for (i = 0 ; labels[i].prop != NULL ; i++) {
+ for (i = 0; labels[i].prop != NULL; i++) {
gchar *padstr;
if (!labels[i].enabled)
continue;
@@ -362,9 +362,9 @@ gint main(gint argc, gchar **argv)
const gchar *fields = NULL;
setlocale(LC_ALL, "");
- textdomain (GETTEXT_PACKAGE);
+ textdomain(GETTEXT_PACKAGE);
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
#if !GLIB_CHECK_VERSION(2,35,1)
g_type_init();
@@ -434,7 +434,7 @@ gint main(gint argc, gchar **argv)
db = osinfo_loader_get_db(loader);
- for (i = 0 ; i < (sizeof(types)/sizeof(types[0])) ; i++) {
+ for (i = 0; i < (sizeof(types)/sizeof(types[0])); i++) {
if (g_str_equal(types[i].name, type)) {
entities = types[i].listFunc(db);
filter = g_object_new(types[i].filterType, NULL);
@@ -702,7 +702,7 @@ Daniel P. Berrange <berrange@xxxxxxxxxx>
=head1 COPYRIGHT
-Copyright (C) 2012 Red Hat, Inc.
+Copyright (C) 2012, 2014 Red Hat, Inc.
=head1 LICENSE
--
1.9.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
