mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib/mcconfig: fix coding style; apply source file template. 

Unconstify some function arguments.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-07-28 10:28:26 +03:00
parent 500e49b50a
commit 0efb799db3
8 changed files with 149 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
lib/mcconfig.h
View File

@ -1,5 +1,5 @@
#ifndef MC_CONFIG_H #ifndef MC__CONFIG_H
#define MC_CONFIG_H #define MC__CONFIG_H
#include "lib/vfs/vfs.h" /* vfs_path_t */ #include "lib/vfs/vfs.h" /* vfs_path_t */
@ -30,89 +30,77 @@ typedef struct mc_config_t
mc_config_t *mc_config_init (const gchar * ini_path, gboolean read_only); mc_config_t *mc_config_init (const gchar * ini_path, gboolean read_only);
void mc_config_deinit (mc_config_t * mc_config); void mc_config_deinit (mc_config_t * mc_config);
gboolean mc_config_del_key (mc_config_t *, const char *, const gchar *); gboolean mc_config_has_param (const mc_config_t * mc_config, const char *group,
gboolean mc_config_del_group (mc_config_t *, const char *); const gchar * param);
gboolean mc_config_has_group (mc_config_t * mc_config, const char *group);
gboolean mc_config_has_param (const mc_config_t *, const char *, const gchar *); gboolean mc_config_del_key (mc_config_t * mc_config, const char *group, const gchar * param);
gboolean mc_config_has_group (mc_config_t *, const char *); gboolean mc_config_del_group (mc_config_t * mc_config, const char *group);
gboolean mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean read_only, gboolean mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean read_only,
gboolean remove_empty); gboolean remove_empty);
gboolean mc_config_save_file (mc_config_t * config, GError ** mcerror);
gboolean mc_config_save_file (mc_config_t * config, GError ** error); gboolean mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path,
GError ** mcerror);
gboolean mc_config_save_to_file (mc_config_t * config, const gchar * filename, GError ** error);
/* mcconfig/get.c: */ /* mcconfig/get.c: */
gchar **mc_config_get_groups (const mc_config_t * mc_config, gsize * len); gchar **mc_config_get_groups (const mc_config_t * mc_config, gsize * len);
gchar **mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize * len); gchar **mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize * len);
gchar *mc_config_get_string (mc_config_t *, const gchar *, const gchar *, const gchar *); gchar *mc_config_get_string (mc_config_t * mc_config, const gchar * group, const gchar * param,
const gchar * def);
gchar *mc_config_get_string_raw (const mc_config_t *, const gchar *, const gchar *, const gchar *); gchar *mc_config_get_string_raw (mc_config_t * mc_config, const gchar * group, const gchar * param,
const gchar * def);
gboolean mc_config_get_bool (mc_config_t *, const gchar *, const gchar *, gboolean); gboolean mc_config_get_bool (mc_config_t * mc_config, const gchar * group, const gchar * param,
gboolean def);
int mc_config_get_int (mc_config_t *, const gchar *, const gchar *, int); int mc_config_get_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int def);
gchar **mc_config_get_string_list (mc_config_t * mc_config, const gchar * group, gchar **mc_config_get_string_list (mc_config_t * mc_config, const gchar * group,
const gchar * param, gsize * length); const gchar * param, gsize * length);
gboolean *mc_config_get_bool_list (mc_config_t * mc_config, const gchar * group,
gboolean *mc_config_get_bool_list (mc_config_t *, const gchar *, const gchar *, gsize *); const gchar * param, gsize * length);
int *mc_config_get_int_list (mc_config_t * mc_config, const gchar * group, const gchar * param,
int *mc_config_get_int_list (mc_config_t *, const gchar *, const gchar *, gsize *); gsize * length);
/* mcconfig/set.c: */ /* mcconfig/set.c: */
void mc_config_set_string_raw (mc_config_t *, const gchar *, const gchar *, const gchar *); void mc_config_set_string_raw (mc_config_t * mc_config, const gchar * group, const gchar * param,
const gchar * value);
void mc_config_set_string_raw_value (mc_config_t *, const gchar *, const gchar *, const gchar *); void mc_config_set_string_raw_value (mc_config_t * mc_config, const gchar * group,
const gchar * param, const gchar * value);
void mc_config_set_string (const mc_config_t *, const gchar *, const gchar *, const gchar *); void mc_config_set_string (mc_config_t * mc_config, const gchar * group, const gchar * param,
const gchar * value);
void mc_config_set_bool (mc_config_t *, const gchar *, const gchar *, gboolean); void mc_config_set_bool (mc_config_t * mc_config, const gchar * group, const gchar * param,
gboolean value);
void mc_config_set_int (mc_config_t *, const gchar *, const gchar *, int); void mc_config_set_int (mc_config_t * mc_config, const gchar * group, const gchar * param,
int value);
void void
mc_config_set_string_list (mc_config_t *, const gchar *, mc_config_set_string_list (mc_config_t * mc_config, const gchar * group, const gchar * param,
const gchar *, const gchar * const[], gsize); const gchar * const value[], gsize length);
void mc_config_set_bool_list (mc_config_t * mc_config, const gchar * group, const gchar * param,
void mc_config_set_bool_list (mc_config_t *, const gchar *, const gchar *, gboolean[], gsize); gboolean value[], gsize length);
void mc_config_set_int_list (mc_config_t * mc_config, const gchar * group, const gchar * param,
void mc_config_set_int_list (mc_config_t *, const gchar *, const gchar *, int[], gsize); int value[], gsize length);
/* mcconfig/dialog.c: */
void mc_config_show_dialog (void);
/* mcconfig/paths.c: */ /* mcconfig/paths.c: */
void mc_config_init_config_paths (GError ** error); void mc_config_init_config_paths (GError ** error);
void mc_config_deinit_config_paths (void); void mc_config_deinit_config_paths (void);
gboolean mc_config_migrate_from_old_place (GError ** error, char **msg);
const char *mc_config_get_data_path (void); const char *mc_config_get_data_path (void);
const char *mc_config_get_cache_path (void); const char *mc_config_get_cache_path (void);
const char *mc_config_get_path (void);
const char *mc_config_get_home_dir (void); const char *mc_config_get_home_dir (void);
const char *mc_config_get_path (void);
char *mc_config_get_full_path (const char *config_name); char *mc_config_get_full_path (const char *config_name);
vfs_path_t *mc_config_get_full_vpath (const char *config_name); vfs_path_t *mc_config_get_full_vpath (const char *config_name);
gboolean mc_config_migrate_from_old_place (GError ** mcerror, char **msg);
/*** inline functions ****************************************************************************/ /*** inline functions ****************************************************************************/
#endif #endif /* MC__CONFIG_H */

50
lib/mcconfig/common.c
View File

@ -30,18 +30,20 @@
#include "lib/global.h" #include "lib/global.h"
#include "lib/vfs/vfs.h" /* mc_stat */ #include "lib/vfs/vfs.h" /* mc_stat */
#include "lib/util.h" #include "lib/util.h"
#include "lib/mcconfig.h" #include "lib/mcconfig.h"
/*** global variables **************************************************/ /*** global variables ****************************************************************************/
/*** file scope macro definitions **************************************/ /*** file scope macro definitions ****************************************************************/
/*** file scope type declarations **************************************/ /*** file scope type declarations ****************************************************************/
/*** file scope variables **********************************************/ /*** file scope variables ************************************************************************/
/*** file scope functions **********************************************/ /* --------------------------------------------------------------------------------------------- */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
static gboolean static gboolean
mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path, GError ** mcerror) mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path, GError ** mcerror)
@ -80,6 +82,7 @@ mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path,
(cur_written = mc_write (fd, (const void *) written_data, total_written)) > 0; (cur_written = mc_write (fd, (const void *) written_data, total_written)) > 0;
written_data += cur_written, total_written -= cur_written) written_data += cur_written, total_written -= cur_written)
; ;
mc_close (fd); mc_close (fd);
g_free (data); g_free (data);
@ -94,9 +97,9 @@ mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path,
return TRUE; return TRUE;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
/*** public functions **************************************************/ /*** public functions ****************************************************************************/
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
mc_config_t * mc_config_t *
mc_config_init (const gchar * ini_path, gboolean read_only) mc_config_init (const gchar * ini_path, gboolean read_only)
@ -105,7 +108,6 @@ mc_config_init (const gchar * ini_path, gboolean read_only)
struct stat st; struct stat st;
mc_config = g_try_malloc0 (sizeof (mc_config_t)); mc_config = g_try_malloc0 (sizeof (mc_config_t));
if (mc_config == NULL) if (mc_config == NULL)
return NULL; return NULL;
@ -115,6 +117,7 @@ mc_config_init (const gchar * ini_path, gboolean read_only)
g_free (mc_config); g_free (mc_config);
return NULL; return NULL;
} }
if (ini_path == NULL) if (ini_path == NULL)
return mc_config; return mc_config;
@ -140,7 +143,7 @@ mc_config_init (const gchar * ini_path, gboolean read_only)
return mc_config; return mc_config;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_deinit (mc_config_t * mc_config) mc_config_deinit (mc_config_t * mc_config)
@ -153,51 +156,51 @@ mc_config_deinit (mc_config_t * mc_config)
} }
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_has_param (const mc_config_t * mc_config, const char *group, const gchar * param) mc_config_has_param (const mc_config_t * mc_config, const char *group, const gchar * param)
{ {
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return FALSE; return FALSE;
return g_key_file_has_key (mc_config->handle, group, param, NULL); return g_key_file_has_key (mc_config->handle, group, param, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_has_group (mc_config_t * mc_config, const char *group) mc_config_has_group (mc_config_t * mc_config, const char *group)
{ {
if (!mc_config || !group) if (mc_config == NULL || group == NULL)
return FALSE; return FALSE;
return g_key_file_has_group (mc_config->handle, group); return g_key_file_has_group (mc_config->handle, group);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_del_key (mc_config_t * mc_config, const char *group, const gchar * param) mc_config_del_key (mc_config_t * mc_config, const char *group, const gchar * param)
{ {
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return FALSE; return FALSE;
return g_key_file_remove_key (mc_config->handle, group, param, NULL); return g_key_file_remove_key (mc_config->handle, group, param, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_del_group (mc_config_t * mc_config, const char *group) mc_config_del_group (mc_config_t * mc_config, const char *group)
{ {
if (!mc_config || !group) if (mc_config == NULL || group == NULL)
return FALSE; return FALSE;
return g_key_file_remove_group (mc_config->handle, group, NULL); return g_key_file_remove_group (mc_config->handle, group, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean read_only, mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean read_only,
@ -247,7 +250,7 @@ mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean r
return ok; return ok;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_save_file (mc_config_t * mc_config, GError ** mcerror) mc_config_save_file (mc_config_t * mc_config, GError ** mcerror)
@ -260,7 +263,7 @@ mc_config_save_file (mc_config_t * mc_config, GError ** mcerror)
return mc_config_new_or_override_file (mc_config, mc_config->ini_path, mcerror); return mc_config_new_or_override_file (mc_config, mc_config->ini_path, mcerror);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path, GError ** mcerror) mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path, GError ** mcerror)
@ -271,7 +274,6 @@ mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path, GError
return FALSE; return FALSE;
return mc_config_new_or_override_file (mc_config, ini_path, mcerror); return mc_config_new_or_override_file (mc_config, ini_path, mcerror);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */

54
lib/mcconfig/get.c
View File

@ -24,19 +24,26 @@
#include "lib/global.h" #include "lib/global.h"
#include "lib/strutil.h" #include "lib/strutil.h"
#include "lib/mcconfig.h" #include "lib/mcconfig.h"
/*** global variables **************************************************/ /*** global variables ****************************************************************************/
/*** file scope macro definitions **************************************/ /*** file scope macro definitions ****************************************************************/
/*** file scope type declarations **************************************/ /*** file scope type declarations ****************************************************************/
/*** file scope variables **********************************************/ /*** file scope variables ************************************************************************/
/*** file scope functions **********************************************/ /*** file scope functions ************************************************************************/
/*** public functions **************************************************/ /* --------------------------------------------------------------------------------------------- */
/*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
/* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
gchar ** gchar **
mc_config_get_groups (const mc_config_t * mc_config, gsize * len) mc_config_get_groups (const mc_config_t * mc_config, gsize * len)
@ -56,7 +63,7 @@ mc_config_get_groups (const mc_config_t * mc_config, gsize * len)
return ret; return ret;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gchar ** gchar **
mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize * len) mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize * len)
@ -76,7 +83,7 @@ mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize *
return ret; return ret;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gchar * gchar *
mc_config_get_string (mc_config_t * mc_config, const gchar * group, mc_config_get_string (mc_config_t * mc_config, const gchar * group,
@ -87,7 +94,7 @@ mc_config_get_string (mc_config_t * mc_config, const gchar * group,
gchar *ret; gchar *ret;
estr_t conv_res; estr_t conv_res;
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return g_strdup (def); return g_strdup (def);
if (!mc_config_has_param (mc_config, group, param)) if (!mc_config_has_param (mc_config, group, param))
@ -123,15 +130,15 @@ mc_config_get_string (mc_config_t * mc_config, const gchar * group,
return g_string_free (buffer, FALSE); return g_string_free (buffer, FALSE);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gchar * gchar *
mc_config_get_string_raw (const mc_config_t * mc_config, const gchar * group, mc_config_get_string_raw (mc_config_t * mc_config, const gchar * group,
const gchar * param, const gchar * def) const gchar * param, const gchar * def)
{ {
gchar *ret; gchar *ret;
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return g_strdup (def); return g_strdup (def);
if (!mc_config_has_param (mc_config, group, param)) if (!mc_config_has_param (mc_config, group, param))
@ -146,12 +153,12 @@ mc_config_get_string_raw (const mc_config_t * mc_config, const gchar * group,
return ret != NULL ? ret : g_strdup (def); return ret != NULL ? ret : g_strdup (def);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean gboolean
mc_config_get_bool (mc_config_t * mc_config, const gchar * group, const gchar * param, gboolean def) mc_config_get_bool (mc_config_t * mc_config, const gchar * group, const gchar * param, gboolean def)
{ {
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return def; return def;
if (!mc_config_has_param (mc_config, group, param)) if (!mc_config_has_param (mc_config, group, param))
@ -163,12 +170,12 @@ mc_config_get_bool (mc_config_t * mc_config, const gchar * group, const gchar *
return g_key_file_get_boolean (mc_config->handle, group, param, NULL); return g_key_file_get_boolean (mc_config->handle, group, param, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
int int
mc_config_get_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int def) mc_config_get_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int def)
{ {
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return def; return def;
if (!mc_config_has_param (mc_config, group, param)) if (!mc_config_has_param (mc_config, group, param))
@ -180,41 +187,40 @@ mc_config_get_int (mc_config_t * mc_config, const gchar * group, const gchar * p
return g_key_file_get_integer (mc_config->handle, group, param, NULL); return g_key_file_get_integer (mc_config->handle, group, param, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
gchar ** gchar **
mc_config_get_string_list (mc_config_t * mc_config, const gchar * group, mc_config_get_string_list (mc_config_t * mc_config, const gchar * group,
const gchar * param, gsize * length) const gchar * param, gsize * length)
{ {
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return NULL; return NULL;
return g_key_file_get_string_list (mc_config->handle, group, param, length, NULL); return g_key_file_get_string_list (mc_config->handle, group, param, length, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
gboolean * gboolean *
mc_config_get_bool_list (mc_config_t * mc_config, const gchar * group, mc_config_get_bool_list (mc_config_t * mc_config, const gchar * group,
const gchar * param, gsize * length) const gchar * param, gsize * length)
{ {
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return NULL; return NULL;
return g_key_file_get_boolean_list (mc_config->handle, group, param, length, NULL); return g_key_file_get_boolean_list (mc_config->handle, group, param, length, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
int * int *
mc_config_get_int_list (mc_config_t * mc_config, const gchar * group, mc_config_get_int_list (mc_config_t * mc_config, const gchar * group,
const gchar * param, gsize * length) const gchar * param, gsize * length)
{ {
if (!mc_config || !group || !param) if (mc_config == NULL || group == NULL || param == NULL)
return NULL; return NULL;
return g_key_file_get_integer_list (mc_config->handle, group, param, length, NULL); return g_key_file_get_integer_list (mc_config->handle, group, param, length, NULL);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */

15
lib/mcconfig/paths.c
View File

@ -127,6 +127,7 @@ static const struct
}; };
#endif /* MC_HOMEDIR_XDG */ #endif /* MC_HOMEDIR_XDG */
/* --------------------------------------------------------------------------------------------- */
/*** file scope functions *********************************************************************** */ /*** file scope functions *********************************************************************** */
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -150,12 +151,11 @@ mc_config_init_one_config_path (const char *path_base, const char *subdir, GErro
mc_return_val_if_error (mcerror, FALSE); mc_return_val_if_error (mcerror, FALSE);
full_path = g_build_filename (path_base, subdir, (char *) NULL); full_path = g_build_filename (path_base, subdir, (char *) NULL);
if (g_file_test (full_path, G_FILE_TEST_EXISTS)) if (g_file_test (full_path, G_FILE_TEST_EXISTS))
{ {
if (g_file_test (full_path, G_FILE_TEST_IS_DIR)) if (g_file_test (full_path, G_FILE_TEST_IS_DIR))
{
config_dir_present = TRUE; config_dir_present = TRUE;
}
else else
{ {
fprintf (stderr, "%s %s\n", _("FATAL: not a directory:"), full_path); fprintf (stderr, "%s %s\n", _("FATAL: not a directory:"), full_path);
@ -199,7 +199,6 @@ mc_config_copy (const char *old_name, const char *new_name, GError ** mcerror)
if (g_file_test (old_name, G_FILE_TEST_IS_DIR)) if (g_file_test (old_name, G_FILE_TEST_IS_DIR))
{ {
GDir *dir; GDir *dir;
const char *dir_name; const char *dir_name;
@ -255,6 +254,7 @@ mc_config_fix_migrated_rules (void)
rename (old_name, new_name); rename (old_name, new_name);
g_free (new_name); g_free (new_name);
} }
g_free (old_name); g_free (old_name);
} }
} }
@ -405,6 +405,7 @@ mc_config_get_home_dir (void)
if (homedir == NULL || *homedir == '\0') if (homedir == NULL || *homedir == '\0')
homedir = g_get_home_dir (); homedir = g_get_home_dir ();
} }
return homedir; return homedir;
} }
@ -445,6 +446,7 @@ mc_config_migrate_from_old_place (GError ** mcerror, char **msg)
for (rule_index = 0; mc_config_files_reference[rule_index].old_filename != NULL; rule_index++) for (rule_index = 0; mc_config_files_reference[rule_index].old_filename != NULL; rule_index++)
{ {
char *old_name; char *old_name;
if (*mc_config_files_reference[rule_index].old_filename == '\0') if (*mc_config_files_reference[rule_index].old_filename == '\0')
continue; continue;
@ -462,6 +464,7 @@ mc_config_migrate_from_old_place (GError ** mcerror, char **msg)
mc_config_copy (old_name, new_name, mcerror); mc_config_copy (old_name, new_name, mcerror);
g_free (new_name); g_free (new_name);
} }
g_free (old_name); g_free (old_name);
} }
@ -501,14 +504,11 @@ mc_config_get_full_path (const char *config_name)
mc_config_init_config_paths (NULL); mc_config_init_config_paths (NULL);
for (rule_index = 0; mc_config_files_reference[rule_index].old_filename != NULL; rule_index++) for (rule_index = 0; mc_config_files_reference[rule_index].old_filename != NULL; rule_index++)
{
if (strcmp (config_name, mc_config_files_reference[rule_index].new_filename) == 0) if (strcmp (config_name, mc_config_files_reference[rule_index].new_filename) == 0)
{
return g_build_filename (*mc_config_files_reference[rule_index].new_basedir, return g_build_filename (*mc_config_files_reference[rule_index].new_basedir,
mc_config_files_reference[rule_index].new_filename, mc_config_files_reference[rule_index].new_filename,
(char *) NULL); (char *) NULL);
}
}
return NULL; return NULL;
} }
@ -530,6 +530,7 @@ mc_config_get_full_vpath (const char *config_name)
ret_vpath = vfs_path_from_str (str_path); ret_vpath = vfs_path_from_str (str_path);
g_free (str_path); g_free (str_path);
return ret_vpath; return ret_vpath;
} }

98
lib/mcconfig/set.c
View File

@ -24,18 +24,20 @@
#include "lib/global.h" #include "lib/global.h"
#include "lib/strutil.h" #include "lib/strutil.h"
#include "lib/mcconfig.h" #include "lib/mcconfig.h"
/*** global variables **************************************************/ /*** global variables ****************************************************************************/
/*** file scope macro definitions **************************************/ /*** file scope macro definitions ****************************************************************/
/*** file scope type declarations **************************************/ /*** file scope type declarations ****************************************************************/
/*** file scope variables **********************************************/ /*** file scope variables ************************************************************************/
/*** file scope functions **********************************************/ /* --------------------------------------------------------------------------------------------- */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
static gchar * static gchar *
mc_config_normalize_before_save (const gchar * value) mc_config_normalize_before_save (const gchar * value)
@ -65,109 +67,91 @@ mc_config_normalize_before_save (const gchar * value)
return g_string_free (buffer, FALSE); return g_string_free (buffer, FALSE);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
/*** public functions **************************************************/ /*** public functions ****************************************************************************/
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_set_string_raw (mc_config_t * mc_config, const gchar * group, mc_config_set_string_raw (mc_config_t * mc_config, const gchar * group,
const gchar * param, const gchar * value) const gchar * param, const gchar * value)
{ {
if (!mc_config || !group || !param || !value) if (mc_config != NULL && group != NULL && param != NULL && value != NULL)
return; g_key_file_set_string (mc_config->handle, group, param, value);
g_key_file_set_string (mc_config->handle, group, param, value);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_set_string_raw_value (mc_config_t * mc_config, const gchar * group, mc_config_set_string_raw_value (mc_config_t * mc_config, const gchar * group,
const gchar * param, const gchar * value) const gchar * param, const gchar * value)
{ {
if (!mc_config || !group || !param || !value) if (mc_config != NULL && group != NULL && param != NULL && value != NULL)
return; g_key_file_set_value (mc_config->handle, group, param, value);
g_key_file_set_value (mc_config->handle, group, param, value);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_set_string (const mc_config_t * mc_config, const gchar * group, mc_config_set_string (mc_config_t * mc_config, const gchar * group,
const gchar * param, const gchar * value) const gchar * param, const gchar * value)
{ {
gchar *buffer; if (mc_config != NULL && group != NULL && param != NULL && value != NULL)
{
gchar *buffer;
if (!mc_config || !group || !param || !value) buffer = mc_config_normalize_before_save (value);
return; g_key_file_set_string (mc_config->handle, group, param, buffer);
g_free (buffer);
buffer = mc_config_normalize_before_save (value); }
g_key_file_set_string (mc_config->handle, group, param, buffer);
g_free (buffer);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_set_bool (mc_config_t * mc_config, const gchar * group, mc_config_set_bool (mc_config_t * mc_config, const gchar * group,
const gchar * param, gboolean value) const gchar * param, gboolean value)
{ {
if (!mc_config || !group || !param) if (mc_config != NULL && group != NULL && param != NULL)
return; g_key_file_set_boolean (mc_config->handle, group, param, value);
g_key_file_set_boolean (mc_config->handle, group, param, value);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_set_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int value) mc_config_set_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int value)
{ {
if (!mc_config || !group || !param) if (mc_config != NULL && group != NULL && param != NULL)
return; g_key_file_set_integer (mc_config->handle, group, param, value);
g_key_file_set_integer (mc_config->handle, group, param, value);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
void void
mc_config_set_string_list (mc_config_t * mc_config, const gchar * group, mc_config_set_string_list (mc_config_t * mc_config, const gchar * group,
const gchar * param, const gchar * const value[], gsize length) const gchar * param, const gchar * const value[], gsize length)
{ {
if (!mc_config || !group || !param || !value || length == 0) if (mc_config != NULL && group != NULL && param != NULL && value != NULL && length != 0)
return; g_key_file_set_string_list (mc_config->handle, group, param, value, length);
g_key_file_set_string_list (mc_config->handle, group, param, value, length);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_set_bool_list (mc_config_t * mc_config, const gchar * group, mc_config_set_bool_list (mc_config_t * mc_config, const gchar * group,
const gchar * param, gboolean value[], gsize length) const gchar * param, gboolean value[], gsize length)
{ {
if (!mc_config || !group || !param || !value || length == 0) if (mc_config != NULL && group != NULL && param != NULL && value != NULL && length != 0)
return; g_key_file_set_boolean_list (mc_config->handle, group, param, value, length);
g_key_file_set_boolean_list (mc_config->handle, group, param, value, length);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */
void void
mc_config_set_int_list (mc_config_t * mc_config, const gchar * group, mc_config_set_int_list (mc_config_t * mc_config, const gchar * group,
const gchar * param, int value[], gsize length) const gchar * param, int value[], gsize length)
{ {
if (!mc_config || !group || !param || !value || length == 0) if (mc_config != NULL && group != NULL && param != NULL && value != NULL && length != 0)
return; g_key_file_set_integer_list (mc_config->handle, group, param, value, length);
g_key_file_set_integer_list (mc_config->handle, group, param, value, length);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* --------------------------------------------------------------------------------------------- */

2
lib/serialize.c
View File

@ -193,7 +193,7 @@ mc_deserialize_str (const char prefix, const char *data, GError ** error)
*/ */
char * char *
mc_serialize_config (const mc_config_t * data, GError ** error) mc_serialize_config (mc_config_t * data, GError ** error)
{ {
gchar **groups, **group_iterator; gchar **groups, **group_iterator;
GString *buffer; GString *buffer;

2
lib/serialize.h
View File

@ -19,7 +19,7 @@
char *mc_serialize_str (const char prefix, const char *data, GError ** error); char *mc_serialize_str (const char prefix, const char *data, GError ** error);
char *mc_deserialize_str (const char prefix, const char *data, GError ** error); char *mc_deserialize_str (const char prefix, const char *data, GError ** error);
char *mc_serialize_config (const mc_config_t * data, GError ** error); char *mc_serialize_config (mc_config_t * data, GError ** error);
mc_config_t *mc_deserialize_config (const char *data, GError ** error); mc_config_t *mc_deserialize_config (const char *data, GError ** error);
/*** inline functions ****************************************************************************/ /*** inline functions ****************************************************************************/

2
tests/src/execute__execute_get_external_cmd_opts_from_config.c
View File

@ -48,7 +48,7 @@ static GPtrArray *mc_config_get_string__return_value;
/* @Mock */ /* @Mock */
gchar * gchar *
mc_config_get_string_raw (const mc_config_t * config_ignored, const gchar * group, mc_config_get_string_raw (mc_config_t * config_ignored, const gchar * group,
const gchar * param, const gchar * default_value) const gchar * param, const gchar * default_value)
{ {
char *return_value; char *return_value;