From bfdd8480b47314f67994d1aaa1da114a408dc692 Mon Sep 17 00:00:00 2001 From: Alexandru Csete Date: Mon, 25 May 2015 13:53:25 +0200 Subject: [PATCH] Indent and fix log messages (issue #7). --- src/mod-cfg-get-param.c | 352 ++++++++++++++++++++-------------------- src/mod-cfg-get-param.h | 22 ++- 2 files changed, 188 insertions(+), 186 deletions(-) diff --git a/src/mod-cfg-get-param.c b/src/mod-cfg-get-param.c index 8465c54..79e3da9 100644 --- a/src/mod-cfg-get-param.c +++ b/src/mod-cfg-get-param.c @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* Gpredict: Real-time satellite tracking and orbit prediction program @@ -25,7 +24,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, visit http://www.fsf.org/ */ -/** \brief Utilities to read module configuration parameters. + +/** + * \brief Utilities to read module configuration parameters. * * This file contains utility functions that can can be used by modules * to read configuration parameters from the GKeyFile of the module. If @@ -38,208 +39,203 @@ * too much repetitive coding in the module implementations, the functions * warp this code into one convenient function call. */ -#include -#include + #ifdef HAVE_CONFIG_H -# include +#include #endif -#include "sat-log.h" + +#include +#include + #include "config-keys.h" #include "sat-cfg.h" +#include "sat-log.h" -/** \brief Get boolean parameter. - * \param f The configuration data for the module. - * \param sec Configuration section in the cfg data (see config-keys.h). - * \param key Configuration key in the cfg data (see config-keys.h). - * \param p SatCfg index to use as fallback. +/** + * \brief Get boolean parameter. + * \param f The configuration data for the module. + * \param sec Configuration section in the cfg data (see config-keys.h). + * \param key Configuration key in the cfg data (see config-keys.h). + * \param p SatCfg index to use as fallback. */ -gboolean -mod_cfg_get_bool (GKeyFile *f, const gchar *sec, const gchar *key, sat_cfg_bool_e p) +gboolean mod_cfg_get_bool(GKeyFile * f, const gchar * sec, const gchar * key, + sat_cfg_bool_e p) { - GError *error = NULL; - gboolean param; + GError *error = NULL; + gboolean param; - /* check whether parameter is present in GKeyFile */ - if (g_key_file_has_key (f, sec, key, NULL)) { + /* check whether parameter is present in GKeyFile, otherwise use sat-cfg */ + if (g_key_file_has_key(f, sec, key, NULL)) + { + param = g_key_file_get_boolean(f, sec, key, &error); - param = g_key_file_get_boolean (f, sec, key, &error); + if (error != NULL) + { + sat_log_log(SAT_LOG_LEVEL_INFO, + _("%s: Failed to read boolean (%s)"), + __func__, error->message); - if (error != NULL) { + g_clear_error(&error); - sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Failed to read boolean (%s)"), - __func__, error->message); - - g_clear_error (&error); - - /* get a timeout from global config */ - param = sat_cfg_get_bool (p); - } - } - /* get value from sat-cfg */ - else { - param = sat_cfg_get_bool (p); - -/* sat_log_log (SAT_LOG_LEVEL_DEBUG, */ -/* _("%s: Boolean value not found, using default (%d)"), */ -/* __func__, param); */ - } - - return param; -} - - -gint -mod_cfg_get_int (GKeyFile *f, const gchar *sec, const gchar *key, sat_cfg_int_e p) -{ - GError *error = NULL; - gint param; - - /* check whether parameter is present in GKeyFile */ - if (g_key_file_has_key (f, sec, key, NULL)) { - - param = g_key_file_get_integer (f, sec, key, &error); - - if (error != NULL) { - - sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Failed to read integer (%s)"), - __func__, error->message); - - g_clear_error (&error); - - /* get a timeout from global config */ - param = sat_cfg_get_int (p); - } - } - /* get value from sat-cfg */ - else { - param = sat_cfg_get_int (p); - -/* sat_log_log (SAT_LOG_LEVEL_DEBUG, */ -/* _("%s: Integer value not found, using default (%d)"), */ -/* __func__, param); */ - } - - return param; -} - - -gchar * -mod_cfg_get_str (GKeyFile *f, const gchar *sec, const gchar *key, sat_cfg_str_e p) -{ - GError *error = NULL; - gchar *param; - - /* check whether parameter is present in GKeyFile */ - if (g_key_file_has_key (f, sec, key, NULL)) { - - param = g_key_file_get_string (f, sec, key, &error); - - if (error != NULL) { - - sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Failed to read string (%s)"), - __func__, error->message); - - g_clear_error (&error); - - /* get a timeout from global config */ - param = sat_cfg_get_str (p); - } - } - /* get value from sat-cfg */ - else { - param = sat_cfg_get_str (p); - -/* sat_log_log (SAT_LOG_LEVEL_DEBUG, */ -/* _("%s: String not found, using default (%s)"), */ -/* __func__, param); */ - } - - return param; - -} - -/** \brief Load an integer list into a hash table that uses the - existinence of datain the hash as a boolean. - It loads NULL's into the hash table. -*/ -void mod_cfg_get_integer_list_boolean(GKeyFile *cfgdata, const gchar* section, - const gchar *key, GHashTable *dest) -{ - gint *sats = NULL; - gsize length; - GError *error = NULL; - guint i; - guint *tkey; - - sats = g_key_file_get_integer_list (cfgdata, - section, - key, - &length, - &error); - if (error != NULL) { - sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Failed to get integer list: %s"), - __func__, error->message); - - g_clear_error (&error); - - /* GLib API says nothing about the contents in case of error */ - if (sats) { - g_free (sats); + /* get a timeout from global config */ + param = sat_cfg_get_bool(p); } - + } + else + { + param = sat_cfg_get_bool(p); + } + + return param; +} + + +gint mod_cfg_get_int(GKeyFile * f, const gchar * sec, const gchar * key, + sat_cfg_int_e p) +{ + GError *error = NULL; + gint param; + + /* check whether parameter is present in GKeyFile */ + if (g_key_file_has_key(f, sec, key, NULL)) + { + param = g_key_file_get_integer(f, sec, key, &error); + + if (error != NULL) + { + sat_log_log(SAT_LOG_LEVEL_WARN, + _("%s: Failed to read integer (%s)"), + __func__, error->message); + + g_clear_error(&error); + + /* get a timeout from global config */ + param = sat_cfg_get_int(p); + } + } + /* get value from sat-cfg */ + else + { + param = sat_cfg_get_int(p); + } + + return param; +} + + +gchar *mod_cfg_get_str(GKeyFile * f, const gchar * sec, + const gchar * key, sat_cfg_str_e p) +{ + GError *error = NULL; + gchar *param; + + /* check whether parameter is present in GKeyFile, otherwise use sat-cfg */ + if (g_key_file_has_key(f, sec, key, NULL)) + { + param = g_key_file_get_string(f, sec, key, &error); + + if (error != NULL) + { + sat_log_log(SAT_LOG_LEVEL_WARN, + _("%s: Failed to read string (%s)"), + __func__, error->message); + + g_clear_error(&error); + + /* get a timeout from global config */ + param = sat_cfg_get_str(p); + } + } + else + { + param = sat_cfg_get_str(p); + } + + return param; +} + +/** + * \brief Load an integer list into a hash table that uses the + * existinence of datain the hash as a boolean. + * It loads NULL's into the hash table. + */ +void mod_cfg_get_integer_list_boolean(GKeyFile * cfgdata, + const gchar * section, const gchar * key, + GHashTable * dest) +{ + gint *sats = NULL; + gsize length; + GError *error = NULL; + guint i; + guint *tkey; + + if (!g_key_file_has_key(cfgdata, section, key, NULL)) + return; + + sats = g_key_file_get_integer_list(cfgdata, section, key, &length, &error); + if (error != NULL) + { + sat_log_log(SAT_LOG_LEVEL_WARN, + _("%s: Failed to get integer list: %s"), + __func__, error->message); + + g_clear_error(&error); + + /* GLib API says nothing about the contents in case of error */ + if (sats) + { + g_free(sats); + } + return; } - + /* read each satellite into hash table */ - for (i = 0; i < length; i++) { - tkey = g_new0 (guint, 1); + for (i = 0; i < length; i++) + { + tkey = g_new0(guint, 1); *tkey = sats[i]; //printf("loading sat %d\n",sats[i]); - if (!(g_hash_table_lookup_extended (dest, tkey, NULL, NULL))) { + if (!(g_hash_table_lookup_extended(dest, tkey, NULL, NULL))) + { /* just add a one to the value so there is presence indicator */ - g_hash_table_insert (dest, - tkey, - NULL); + g_hash_table_insert(dest, tkey, NULL); } } g_free(sats); } -/** \brief Convert the "boolean" hash back into an integer list and - save it to the cfgdata. */ -void mod_cfg_set_integer_list_boolean (GKeyFile *cfgdata, GHashTable *hash, const gchar *cfgsection, const gchar *cfgkey) +/** + * \brief Convert the "boolean" hash back into an integer list and + * save it to the cfgdata. + */ +void mod_cfg_set_integer_list_boolean(GKeyFile * cfgdata, GHashTable * hash, + const gchar * cfgsection, + const gchar * cfgkey) { - gint *showtrack; - gint *something; - gint i,length; - GList *keys = g_hash_table_get_keys(hash); - + gint *showtrack; + gint *something; + gint i, length; + GList *keys = g_hash_table_get_keys(hash); + length = g_list_length(keys); - if (g_list_length(keys)>0) { - - showtrack = g_try_new0(gint,g_list_length(keys)); - for (i=0;i 0) + { + showtrack = g_try_new0(gint, g_list_length(keys)); + for (i = 0; i < length; i++) + { + something = g_list_nth_data(keys, i); + showtrack[i] = *something; } - g_key_file_set_integer_list (cfgdata, - cfgsection, - cfgkey, - showtrack, - g_list_length(keys) - ); - - } else { - g_key_file_remove_key(cfgdata, - cfgsection, - cfgkey, - NULL); + g_key_file_set_integer_list(cfgdata, + cfgsection, + cfgkey, showtrack, g_list_length(keys)); } - - g_list_free (keys); + else + { + g_key_file_remove_key(cfgdata, cfgsection, cfgkey, NULL); + } + + g_list_free(keys); } diff --git a/src/mod-cfg-get-param.h b/src/mod-cfg-get-param.h index c458186..8a6ffd2 100644 --- a/src/mod-cfg-get-param.h +++ b/src/mod-cfg-get-param.h @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* Gpredict: Real-time satellite tracking and orbit prediction program @@ -30,12 +29,19 @@ #include "sat-cfg.h" -gboolean mod_cfg_get_bool (GKeyFile *f, const gchar *sec, const gchar *key, sat_cfg_bool_e p); -gint mod_cfg_get_int (GKeyFile *f, const gchar *sec, const gchar *key, sat_cfg_int_e p); -gchar *mod_cfg_get_str (GKeyFile *f, const gchar *sec, const gchar *key, sat_cfg_str_e p); -void mod_cfg_get_integer_list_boolean (GKeyFile *cfgdata,const gchar* section,const gchar *key,GHashTable *dest); -void mod_cfg_set_integer_list_boolean (GKeyFile *cfgdata, GHashTable *hash, const gchar *cfgsection, const gchar *cfgkey); - - +gboolean mod_cfg_get_bool(GKeyFile * f, const gchar * sec, + const gchar * key, sat_cfg_bool_e p); +gint mod_cfg_get_int(GKeyFile * f, const gchar * sec, + const gchar * key, sat_cfg_int_e p); +gchar *mod_cfg_get_str(GKeyFile * f, const gchar * sec, + const gchar * key, sat_cfg_str_e p); +void mod_cfg_get_integer_list_boolean(GKeyFile * cfgdata, + const gchar * section, + const gchar * key, + GHashTable * dest); +void mod_cfg_set_integer_list_boolean(GKeyFile * cfgdata, + GHashTable * hash, + const gchar * cfgsection, + const gchar * cfgkey); #endif