Skip to content

Commit

Permalink
Remove support for explicitly named mce ini-files
Browse files Browse the repository at this point in the history 
Since the whole mce code base is now using the combined ini-file
data, we can
a) remove unused functions mce_conf_read_conf_file() and
   mce_conf_free_conf_file()
b) omit passing of NULL keyfileptr to the rest of mce_conf_xxx()
  • Loading branch information
@spiiroin
spiiroin committed Mar 25, 2013
1 parent 216c1ed commit 87ede0b
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 157 deletions.
3 changes: 1 addition & 2 deletions event-input.c
View file
Expand Up @@ -1471,8 +1471,7 @@ gboolean mce_input_init(void)
/* Get configuration options */
longdelay = mce_conf_get_int(MCE_CONF_HOMEKEY_GROUP,
MCE_CONF_HOMEKEY_LONG_DELAY,
DEFAULT_HOME_LONG_DELAY,
NULL);
DEFAULT_HOME_LONG_DELAY);

update_switch_states();

Expand Down
74 changes: 16 additions & 58 deletions mce-conf.c
View file
Expand Up @@ -36,9 +36,9 @@ static gpointer keyfile = NULL;
*
* @returns non-null keyfile pointer, or aborts
*/
static gpointer mce_conf_get_keyfile(gpointer keyfileptr)
static gpointer mce_conf_get_keyfile(void)
{
if( !keyfileptr && !(keyfileptr = keyfile) ) {
if( !keyfile ) {
/* Earlier it was possible to have mce running with NULL
* keyfile. Now the only reasons that might happen are:
* 1) mce_conf_init() was not called yet
Expand All @@ -49,7 +49,7 @@ static gpointer mce_conf_get_keyfile(gpointer keyfileptr)
"properly initializing it");
mce_abort();
}
return keyfileptr;
return keyfile;
}

/**
Expand All @@ -62,12 +62,12 @@ static gpointer mce_conf_get_keyfile(gpointer keyfileptr)
* @return The configuration value on success, the default value on failure
*/
gboolean mce_conf_get_bool(const gchar *group, const gchar *key,
const gboolean defaultval, gpointer keyfileptr)
const gboolean defaultval)
{
gboolean tmp = FALSE;
GError *error = NULL;

keyfileptr = mce_conf_get_keyfile(keyfileptr);
gpointer keyfileptr = mce_conf_get_keyfile();

tmp = g_key_file_get_boolean(keyfileptr, group, key, &error);

Expand All @@ -94,12 +94,12 @@ gboolean mce_conf_get_bool(const gchar *group, const gchar *key,
* @return The configuration value on success, the default value on failure
*/
gint mce_conf_get_int(const gchar *group, const gchar *key,
const gint defaultval, gpointer keyfileptr)
const gint defaultval)
{
gint tmp = -1;
GError *error = NULL;

keyfileptr = mce_conf_get_keyfile(keyfileptr);
gpointer keyfileptr = mce_conf_get_keyfile();

tmp = g_key_file_get_integer(keyfileptr, group, key, &error);

Expand All @@ -126,12 +126,12 @@ gint mce_conf_get_int(const gchar *group, const gchar *key,
* @return The configuration value on success, NULL on failure
*/
gint *mce_conf_get_int_list(const gchar *group, const gchar *key,
gsize *length, gpointer keyfileptr)
gsize *length)
{
gint *tmp = NULL;
GError *error = NULL;

keyfileptr = mce_conf_get_keyfile(keyfileptr);
gpointer keyfileptr = mce_conf_get_keyfile();

tmp = g_key_file_get_integer_list(keyfileptr, group, key,
length, &error);
Expand Down Expand Up @@ -159,12 +159,12 @@ gint *mce_conf_get_int_list(const gchar *group, const gchar *key,
* @return The configuration value on success, the default value on failure
*/
gchar *mce_conf_get_string(const gchar *group, const gchar *key,
const gchar *defaultval, gpointer keyfileptr)
const gchar *defaultval)
{
gchar *tmp = NULL;
GError *error = NULL;

keyfileptr = mce_conf_get_keyfile(keyfileptr);
gpointer keyfileptr = mce_conf_get_keyfile();

tmp = g_key_file_get_string(keyfileptr, group, key, &error);

Expand Down Expand Up @@ -195,12 +195,12 @@ gchar *mce_conf_get_string(const gchar *group, const gchar *key,
* @return The configuration value on success, NULL on failure
*/
gchar **mce_conf_get_string_list(const gchar *group, const gchar *key,
gsize *length, gpointer keyfileptr)
gsize *length)
{
gchar **tmp = NULL;
GError *error = NULL;

keyfileptr = mce_conf_get_keyfile(keyfileptr);
gpointer keyfileptr = mce_conf_get_keyfile();

tmp = g_key_file_get_string_list(keyfileptr, group, key,
length, &error);
Expand All @@ -218,13 +218,12 @@ gchar **mce_conf_get_string_list(const gchar *group, const gchar *key,
return tmp;
}

gchar **mce_conf_get_keys(const gchar *group, gsize *length,
gpointer keyfileptr)
gchar **mce_conf_get_keys(const gchar *group, gsize *length)
{
gchar **tmp = NULL;
GError *error = NULL;

keyfileptr = mce_conf_get_keyfile(keyfileptr);
gpointer keyfileptr = mce_conf_get_keyfile();

tmp = g_key_file_get_keys(keyfileptr, group, length, &error);

Expand All @@ -241,47 +240,6 @@ gchar **mce_conf_get_keys(const gchar *group, gsize *length,
return tmp;
}

/**
* Free configuration file
*
* @param keyfileptr A pointer to the keyfile to free
*/
void mce_conf_free_conf_file(gpointer keyfileptr)
{
if (keyfileptr != NULL) {
g_key_file_free(keyfileptr);
}
}

/**
* Read configuration file
*
* @param conffile The full path to the configuration file to read
* @return A keyfile pointer on success, NULL on failure
*/
gpointer mce_conf_read_conf_file(const gchar *const conffile)
{
GError *error = NULL;
GKeyFile *keyfileptr;

if ((keyfileptr = g_key_file_new()) == NULL)
goto EXIT;

if (g_key_file_load_from_file(keyfileptr, conffile,
G_KEY_FILE_NONE, &error) == FALSE) {
mce_conf_free_conf_file(keyfileptr);
keyfileptr = NULL;
mce_log(LL_WARN, "Could not load %s; %s",
conffile, error->message);
goto EXIT;
}

EXIT:
g_clear_error(&error);

return keyfileptr;
}

/** Copy key value key value from one keyfile to another
*
* @param dest keyfile to modify
Expand Down Expand Up @@ -644,7 +602,7 @@ void mce_conf_exit(void)
g_strfreev(keybd_cached), keybd_cached = 0;
g_strfreev(black_cached), black_cached = 0;

mce_conf_free_conf_file(keyfile), keyfile = 0;
if( keyfile ) g_key_file_free(keyfile), keyfile = 0;

return;
}
Expand Down
16 changes: 6 additions & 10 deletions mce-conf.h
View file
Expand Up @@ -24,20 +24,16 @@
#include <glib.h>

gboolean mce_conf_get_bool(const gchar *group, const gchar *key,
const gboolean defaultval, gpointer keyfileptr);
const gboolean defaultval);
gint mce_conf_get_int(const gchar *group, const gchar *key,
const gint defaultval, gpointer keyfileptr);
const gint defaultval);
gint *mce_conf_get_int_list(const gchar *group, const gchar *key,
gsize *length, gpointer keyfileptr);
gsize *length);
gchar *mce_conf_get_string(const gchar *group, const gchar *key,
const gchar *defaultval, gpointer keyfileptr);
const gchar *defaultval);
gchar **mce_conf_get_string_list(const gchar *group, const gchar *key,
gsize *length, gpointer keyfileptr);
gchar **mce_conf_get_keys(const gchar *group, gsize *length,
gpointer keyfileptr);

gpointer mce_conf_read_conf_file(const gchar *const conffile);
void mce_conf_free_conf_file(gpointer keyfileptr);
gsize *length);
gchar **mce_conf_get_keys(const gchar *group, gsize *length);

gboolean mce_conf_init(void);
void mce_conf_exit(void);
Expand Down
3 changes: 1 addition & 2 deletions mce-dsme.c
View file
Expand Up @@ -658,8 +658,7 @@ gboolean mce_dsme_init(gboolean debug_mode)
/* Get configuration options */
tmp = mce_conf_get_string(MCE_CONF_SOFTPOWEROFF_GROUP,
MCE_CONF_SOFTPOWEROFF_CHARGER_POLICY_CONNECT,
"",
NULL);
"");

softoff_charger_connect_policy = mce_translate_string_to_int_with_default(soft_poweroff_charger_connect_translation, tmp, DEFAULT_SOFTOFF_CHARGER_CONNECT);
g_free(tmp);
Expand Down
6 changes: 2 additions & 4 deletions mce-modules.c
View file
Expand Up @@ -169,14 +169,12 @@ gboolean mce_modules_init(void)
/* Get the module path */
path = mce_conf_get_string(MCE_CONF_MODULES_GROUP,
MCE_CONF_MODULES_PATH,
DEFAULT_MCE_MODULE_PATH,
NULL);
DEFAULT_MCE_MODULE_PATH);

/* Get the list modules to load */
modlist = mce_conf_get_string_list(MCE_CONF_MODULES_GROUP,
MCE_CONF_MODULES_MODULES,
&length,
NULL);
&length);

if (modlist != NULL) {
gint i;
Expand Down
3 changes: 1 addition & 2 deletions modules/camera.c
View file
Expand Up @@ -140,8 +140,7 @@ const gchar *g_module_check_init(GModule *module)
/* Get configuration options */
popout_unlock = mce_conf_get_bool(MCE_CONF_TKLOCK_GROUP,
MCE_CONF_CAMERA_POPOUT_UNLOCK,
DEFAULT_CAMERA_POPOUT_UNLOCK,
NULL);
DEFAULT_CAMERA_POPOUT_UNLOCK);

/* Register I/O monitors */
// FIXME: error handling?
Expand Down
24 changes: 9 additions & 15 deletions modules/display.c
View file
Expand Up @@ -569,7 +569,7 @@ static gboolean get_display_type_from_config(display_type_t *display_type)
/* First check if we have a configured brightness directory
* that a) exists and b) contains both brightness and
* max_brightness files */
if( (vdir = mce_conf_get_string_list(group, "brightness_dir", 0, 0)) ) {
if( (vdir = mce_conf_get_string_list(group, "brightness_dir", 0)) ) {
for( size_t i = 0; vdir[i]; ++i ) {
if( !*vdir[i] || g_access(vdir[i], F_OK) )
continue;
Expand All @@ -581,10 +581,10 @@ static gboolean get_display_type_from_config(display_type_t *display_type)

/* Then check if we can find mathes from possible brightness and
* max_brightness file lists */
if( !(vset = mce_conf_get_string_list(group, "brightness", 0, 0)) )
if( !(vset = mce_conf_get_string_list(group, "brightness", 0)) )
goto EXIT;

if( !(vmax = mce_conf_get_string_list(group, "max_brightness", 0, 0)) )
if( !(vmax = mce_conf_get_string_list(group, "max_brightness", 0)) )
goto EXIT;

for( size_t i = 0; vset[i]; ++i ) {
Expand Down Expand Up @@ -3764,43 +3764,37 @@ const gchar *g_module_check_init(GModule *module)
/* Get configuration options */
str = mce_conf_get_string(MCE_CONF_DISPLAY_GROUP,
MCE_CONF_BRIGHTNESS_INCREASE_POLICY,
"",
NULL);
"");

brightness_increase_policy = mce_translate_string_to_int_with_default(brightness_change_policy_translation, str, DEFAULT_BRIGHTNESS_INCREASE_POLICY);
g_free(str);

str = mce_conf_get_string(MCE_CONF_DISPLAY_GROUP,
MCE_CONF_BRIGHTNESS_DECREASE_POLICY,
"",
NULL);
"");

brightness_decrease_policy = mce_translate_string_to_int_with_default(brightness_change_policy_translation, str, DEFAULT_BRIGHTNESS_DECREASE_POLICY);
g_free(str);

brightness_increase_step_time =
mce_conf_get_int(MCE_CONF_DISPLAY_GROUP,
MCE_CONF_STEP_TIME_INCREASE,
DEFAULT_BRIGHTNESS_INCREASE_STEP_TIME,
NULL);
DEFAULT_BRIGHTNESS_INCREASE_STEP_TIME);

brightness_decrease_step_time =
mce_conf_get_int(MCE_CONF_DISPLAY_GROUP,
MCE_CONF_STEP_TIME_DECREASE,
DEFAULT_BRIGHTNESS_DECREASE_STEP_TIME,
NULL);
DEFAULT_BRIGHTNESS_DECREASE_STEP_TIME);

brightness_increase_constant_time =
mce_conf_get_int(MCE_CONF_DISPLAY_GROUP,
MCE_CONF_CONSTANT_TIME_INCREASE,
DEFAULT_BRIGHTNESS_INCREASE_CONSTANT_TIME,
NULL);
DEFAULT_BRIGHTNESS_INCREASE_CONSTANT_TIME);

brightness_decrease_constant_time =
mce_conf_get_int(MCE_CONF_DISPLAY_GROUP,
MCE_CONF_CONSTANT_TIME_DECREASE,
DEFAULT_BRIGHTNESS_DECREASE_CONSTANT_TIME,
NULL);
DEFAULT_BRIGHTNESS_DECREASE_CONSTANT_TIME);

/* Note: Transition to MCE_DISPLAY_OFF can be made already
* here, but the MCE_DISPLAY_ON state is blocked until mCE
Expand Down
11 changes: 4 additions & 7 deletions modules/filter-brightness-als.c
View file
Expand Up @@ -2270,7 +2270,7 @@ static gchar *read_default_color_profile(void)
{
return mce_conf_get_string(MCE_CONF_COMMON_GROUP,
MCE_CONF_DEFAULT_PROFILE_ID_KEY,
NULL, NULL);
NULL);
}

/**
Expand Down Expand Up @@ -2326,8 +2326,7 @@ static gboolean init_color_profiles(void)
group = g_strconcat(MCE_COLOR_PROFILE_GROUP_PREFIX, display_id, NULL);

color_profile_ids = mce_conf_get_keys(group,
&num_color_profile_ids,
NULL);
&num_color_profile_ids);

for (i = 0; i < num_color_profile_ids; i++) {
cpa_profile_entry *entry = g_new0(cpa_profile_entry, 1);
Expand All @@ -2339,8 +2338,7 @@ static gboolean init_color_profiles(void)

raw_cp = mce_conf_get_int_list(group,
color_profile_ids[i],
&raw_cp_length,
NULL);
&raw_cp_length);

if (is_raw_color_profile_valid(raw_cp,
raw_cp_length) == FALSE) {
Expand Down Expand Up @@ -2561,8 +2559,7 @@ const gchar *g_module_check_init(GModule *module)
/* Get configuration options */
str = mce_conf_get_string(MCE_CONF_ALS_GROUP,
MCE_CONF_STEP_DOWN_POLICY,
"",
NULL);
"");

brightness_step_down_policy = mce_translate_string_to_int_with_default(brightness_step_policy_translation, str, DEFAULT_BRIGHTNESS_STEP_DOWN_POLICY);
g_free(str);
Expand Down
9 changes: 3 additions & 6 deletions modules/keypad.c
View file
Expand Up @@ -758,14 +758,12 @@ const gchar *g_module_check_init(GModule *module)
key_backlight_timeout =
mce_conf_get_int(MCE_CONF_KEYPAD_GROUP,
MCE_CONF_KEY_BACKLIGHT_TIMEOUT,
DEFAULT_KEY_BACKLIGHT_TIMEOUT,
NULL);
DEFAULT_KEY_BACKLIGHT_TIMEOUT);

key_backlight_fade_in_time =
mce_conf_get_int(MCE_CONF_KEYPAD_GROUP,
MCE_CONF_KEY_BACKLIGHT_FADE_IN_TIME,
DEFAULT_KEY_BACKLIGHT_FADE_IN_TIME,
NULL);
DEFAULT_KEY_BACKLIGHT_FADE_IN_TIME);

if (((key_backlight_fade_in_time % 125) != 0) &&
(key_backlight_fade_in_time > 1000))
Expand All @@ -775,8 +773,7 @@ const gchar *g_module_check_init(GModule *module)
key_backlight_fade_out_time =
mce_conf_get_int(MCE_CONF_KEYPAD_GROUP,
MCE_CONF_KEY_BACKLIGHT_FADE_OUT_TIME,
DEFAULT_KEY_BACKLIGHT_FADE_OUT_TIME,
NULL);
DEFAULT_KEY_BACKLIGHT_FADE_OUT_TIME);

if (((key_backlight_fade_out_time % 125) != 0) &&
(key_backlight_fade_out_time > 1000))
Expand Down

0 comments on commit 87ede0b

Please sign in to comment.