Use argument names in function declarations.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/event.h

@@ -24,17 +24,20 @@ typedef struct
 /*** declarations of public functions ************************************************************/
 
 /* event.c: */
-gboolean mc_event_init (GError **);
-gboolean mc_event_deinit (GError **);
+gboolean mc_event_init (GError ** mcerror);
+gboolean mc_event_deinit (GError ** mcerror);
 
 
 /* manage.c: */
-gboolean mc_event_add (const gchar *, const gchar *, mc_event_callback_func_t, gpointer, GError **);
-void mc_event_del (const gchar *, const gchar *, mc_event_callback_func_t, gpointer);
-void mc_event_destroy (const gchar *, const gchar *);
-void mc_event_group_del (const gchar *);
-gboolean mc_event_present (const gchar *, const gchar *);
-gboolean mc_event_mass_add (const event_init_t *, GError **);
+gboolean mc_event_add (const gchar * event_group_name, const gchar * event_name,
+                       mc_event_callback_func_t event_callback, gpointer event_init_data,
+                       GError ** mcerror);
+void mc_event_del (const gchar * event_group_name, const gchar * event_name,
+                   mc_event_callback_func_t event_callback, gpointer event_init_data);
+void mc_event_destroy (const gchar * event_group_name, const gchar * event_name);
+void mc_event_group_del (const gchar * event_group_name);
+gboolean mc_event_present (const gchar * event_group_name, const gchar * event_name);
+gboolean mc_event_mass_add (const event_init_t * events, GError ** mcerror);
 
 /* raise.c: */
 gboolean mc_event_raise (const gchar *, const gchar *, gpointer);

lib/filehighlight.h

@@ -20,14 +20,14 @@ typedef struct mc_fhl_struct
 
 /*** declarations of public functions ************************************************************/
 
-mc_fhl_t *mc_fhl_new (gboolean);
-void mc_fhl_free (mc_fhl_t **);
+mc_fhl_t *mc_fhl_new (gboolean need_auto_fill);
+void mc_fhl_free (mc_fhl_t ** fhl);
 
-int mc_fhl_get_color (mc_fhl_t *, file_entry_t *);
+int mc_fhl_get_color (mc_fhl_t * fhl, file_entry_t * fe);
 
-gboolean mc_fhl_read_ini_file (mc_fhl_t *, const gchar *);
-gboolean mc_fhl_parse_ini_file (mc_fhl_t *);
-void mc_fhl_clear (mc_fhl_t *);
+gboolean mc_fhl_read_ini_file (mc_fhl_t * fhl, const gchar * filename);
+gboolean mc_fhl_parse_ini_file (mc_fhl_t * fhl);
+void mc_fhl_clear (mc_fhl_t * fhl);
 
 /*** inline functions ****************************************************************************/
 

lib/filehighlight/internal.h

@@ -51,9 +51,9 @@ typedef struct mc_fhl_filter_struct
 
 /*** declarations of public functions ************************************************************/
 
-void mc_fhl_array_free (mc_fhl_t *);
+void mc_fhl_array_free (mc_fhl_t * fhl);
 
-gboolean mc_fhl_init_from_standard_files (mc_fhl_t *);
+gboolean mc_fhl_init_from_standard_files (mc_fhl_t * fhl);
 
 /*** inline functions ****************************************************************************/
 

lib/search.h

@@ -150,26 +150,26 @@ gboolean mc_search_prepare (mc_search_t * mc_search);
 gboolean mc_search_run (mc_search_t * mc_search, const void *user_data, gsize start_search,
                         gsize end_search, gsize * found_len);
 
-gboolean mc_search_is_type_avail (mc_search_type_t);
+gboolean mc_search_is_type_avail (mc_search_type_t search_type);
 
 const mc_search_type_str_t *mc_search_types_list_get (size_t * num);
 
 GString *mc_search_prepare_replace_str (mc_search_t * mc_search, GString * replace_str);
 char *mc_search_prepare_replace_str2 (mc_search_t * lc_mc_search, const char *replace_str);
 
-gboolean mc_search_is_fixed_search_str (mc_search_t *);
+gboolean mc_search_is_fixed_search_str (const mc_search_t * lc_mc_search);
 
 gchar **mc_search_get_types_strings_array (size_t * num);
 
 gboolean mc_search (const gchar * pattern, const gchar * pattern_charset, const gchar * str,
                     mc_search_type_t type);
 
-int mc_search_getstart_result_by_num (mc_search_t *, int);
-int mc_search_getend_result_by_num (mc_search_t *, int);
+int mc_search_getstart_result_by_num (mc_search_t * lc_mc_search, int lc_index);
+int mc_search_getend_result_by_num (mc_search_t * lc_mc_search, int lc_index);
 
 /* *INDENT-OFF* */
 void mc_search_set_error (mc_search_t * lc_mc_search, mc_search_error_t code, const gchar * format, ...)
      G_GNUC_PRINTF (3, 4);
 /* *INDENT-ON* */
 
-#endif
+#endif /* MC__SEARCH_H */

lib/search/internal.h

@@ -38,46 +38,45 @@ typedef struct mc_search_cond_struct
 
 /* search/lib.c : */
 
-gchar *mc_search__recode_str (const char *, gsize, const char *, const char *, gsize *);
-
-gchar *mc_search__get_one_symbol (const char *, const char *, gsize, gboolean *);
-
-GString *mc_search__tolower_case_str (const char *, const char *, gsize);
-
-GString *mc_search__toupper_case_str (const char *, const char *, gsize);
+gchar *mc_search__recode_str (const char *str, gsize str_len, const char *charset_from,
+                              const char *charset_to, gsize * bytes_written);
+gchar *mc_search__get_one_symbol (const char *charset, const char *str, gsize str_len,
+                                  gboolean * just_letters);
+GString *mc_search__tolower_case_str (const char *charset, const char *str, gsize str_len);
+GString *mc_search__toupper_case_str (const char *charset, const char *str, gsize str_len);
 
 /* search/regex.c : */
 
-void mc_search__cond_struct_new_init_regex (const char *, mc_search_t *, mc_search_cond_t *);
-
-gboolean mc_search__run_regex (mc_search_t *, const void *, gsize, gsize, gsize *);
-
-GString *mc_search_regex_prepare_replace_str (mc_search_t *, GString *);
+void mc_search__cond_struct_new_init_regex (const char *charset, mc_search_t * lc_mc_search,
+                                            mc_search_cond_t * mc_search_cond);
+gboolean mc_search__run_regex (mc_search_t * lc_mc_search, const void *user_data,
+                               gsize start_search, gsize end_search, gsize * found_len);
+GString *mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str);
 
 /* search/normal.c : */
 
-void mc_search__cond_struct_new_init_normal (const char *, mc_search_t *, mc_search_cond_t *);
-
-gboolean mc_search__run_normal (mc_search_t *, const void *, gsize, gsize, gsize *);
-
-GString *mc_search_normal_prepare_replace_str (mc_search_t *, GString *);
+void mc_search__cond_struct_new_init_normal (const char *charset, mc_search_t * lc_mc_search,
+                                             mc_search_cond_t * mc_search_cond);
+gboolean mc_search__run_normal (mc_search_t * lc_mc_search, const void *user_data,
+                                gsize start_search, gsize end_search, gsize * found_len);
+GString *mc_search_normal_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str);
 
 /* search/glob.c : */
 
-void mc_search__cond_struct_new_init_glob (const char *, mc_search_t *, mc_search_cond_t *);
-
-gboolean mc_search__run_glob (mc_search_t *, const void *, gsize, gsize, gsize *);
-
-GString *mc_search_glob_prepare_replace_str (mc_search_t *, GString *);
+void mc_search__cond_struct_new_init_glob (const char *charset, mc_search_t * lc_mc_search,
+                                           mc_search_cond_t * mc_search_cond);
+gboolean mc_search__run_glob (mc_search_t * lc_mc_search, const void *user_data,
+                              gsize start_search, gsize end_search, gsize * found_len);
+GString *mc_search_glob_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str);
 
 /* search/hex.c : */
 
-void mc_search__cond_struct_new_init_hex (const char *, mc_search_t *, mc_search_cond_t *);
-
-gboolean mc_search__run_hex (mc_search_t *, const void *, gsize, gsize, gsize *);
-
-GString *mc_search_hex_prepare_replace_str (mc_search_t *, GString *);
+void mc_search__cond_struct_new_init_hex (const char *charset, mc_search_t * lc_mc_search,
+                                          mc_search_cond_t * mc_search_cond);
+gboolean mc_search__run_hex (mc_search_t * lc_mc_search, const void *user_data,
+                             gsize start_search, gsize end_search, gsize * found_len);
+GString *mc_search_hex_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str);
 
 /*** inline functions ****************************************************************************/
 
-#endif
+#endif /* MC__SEARCH_INTERNAL_H */

lib/search/search.c

@@ -403,7 +403,7 @@ mc_search_prepare_replace_str2 (mc_search_t * lc_mc_search, const char *replace_
 /* --------------------------------------------------------------------------------------------- */
 
 gboolean
-mc_search_is_fixed_search_str (mc_search_t * lc_mc_search)
+mc_search_is_fixed_search_str (const mc_search_t * lc_mc_search)
 {
     if (lc_mc_search == NULL)
         return FALSE;

lib/skin.h

@@ -134,11 +134,11 @@ extern mc_skin_t mc_skin__default;
 gboolean mc_skin_init (const gchar * skin_override, GError ** error);
 void mc_skin_deinit (void);
 
-int mc_skin_color_get (const gchar *, const gchar *);
+int mc_skin_color_get (const gchar * group, const gchar * name);
 
-void mc_skin_lines_parse_ini_file (mc_skin_t *);
+void mc_skin_lines_parse_ini_file (mc_skin_t * mc_skin);
 
-gchar *mc_skin_get (const gchar *, const gchar *, const gchar *);
+gchar *mc_skin_get (const gchar * group, const gchar * key, const gchar * default_value);
 
 GPtrArray *mc_skin_list (void);
 

lib/skin/internal.h

@@ -22,18 +22,18 @@ typedef struct mc_skin_color_struct
 
 /*** declarations of public functions ************************************************************/
 
-gboolean mc_skin_ini_file_load (mc_skin_t *);
-gboolean mc_skin_ini_file_parse (mc_skin_t *);
-void mc_skin_set_hardcoded_skin (mc_skin_t *);
+gboolean mc_skin_ini_file_load (mc_skin_t * mc_skin);
+gboolean mc_skin_ini_file_parse (mc_skin_t * mc_skin);
+void mc_skin_set_hardcoded_skin (mc_skin_t * mc_skin);
 
-gboolean mc_skin_ini_file_parse_colors (mc_skin_t *);
-gboolean mc_skin_color_parse_ini_file (mc_skin_t *);
+gboolean mc_skin_ini_file_parse_colors (mc_skin_t * mc_skin);
+gboolean mc_skin_color_parse_ini_file (mc_skin_t * mc_skin);
 
-void mc_skin_hardcoded_ugly_lines (mc_skin_t *);
-void mc_skin_hardcoded_space_lines (mc_skin_t *);
-void mc_skin_hardcoded_blackwhite_colors (mc_skin_t *);
+void mc_skin_hardcoded_ugly_lines (mc_skin_t * mc_skin);
+void mc_skin_hardcoded_space_lines (mc_skin_t * mc_skin);
+void mc_skin_hardcoded_blackwhite_colors (mc_skin_t * mc_skin);
 
-void mc_skin_colors_old_configure (mc_skin_t *);
+void mc_skin_colors_old_configure (mc_skin_t * mc_skin);
 
 /*** inline functions ****************************************************************************/
 

lib/strescape.h

@@ -15,18 +15,19 @@
 
 /*** declarations of public functions ************************************************************/
 
-char *strutils_escape (const char *, gsize, const char *, gboolean);
-char *strutils_unescape (const char *, gsize, const char *, gboolean);
+char *strutils_escape (const char *src, gsize src_len, const char *escaped_chars,
+                       gboolean escape_non_printable);
+char *strutils_unescape (const char *src, gsize src_len, const char *unescaped_chars,
+                         gboolean unescape_non_printable);
+char *strutils_shell_unescape (const char *text);
+char *strutils_shell_escape (const char *text);
 
-char *strutils_shell_unescape (const char *);
-char *strutils_shell_escape (const char *);
+char *strutils_glob_escape (const char *text);
+char *strutils_glob_unescape (const char *text);
 
-char *strutils_glob_escape (const char *);
-char *strutils_glob_unescape (const char *);
+char *strutils_regex_escape (const char *text);
+char *strutils_regex_unescape (const char *text);
 
-char *strutils_regex_escape (const char *);
-char *strutils_regex_unescape (const char *);
+gboolean strutils_is_char_escaped (const char *start, const char *current);
 
-gboolean strutils_is_char_escaped (const char *, const char *);
-
-#endif
+#endif /* MC__STRUTILS_ESCAPE_H */

lib/strutil.h

@@ -107,46 +107,46 @@ struct str_class
     gchar *(*conv_gerror_message) (GError * error, const char *def_msg);
       /*I*/ estr_t (*vfs_convert_to) (GIConv coder, const char *string, int size, GString * buffer);
       /*I*/ void (*insert_replace_char) (GString * buffer);
-    gboolean (*is_valid_string) (const char *);
-      /*I*/ int (*is_valid_char) (const char *, size_t);
-      /*I*/ void (*cnext_char) (const char **);
-    void (*cprev_char) (const char **);
-    void (*cnext_char_safe) (const char **);
-      /*I*/ void (*cprev_char_safe) (const char **);
+    gboolean (*is_valid_string) (const char *text);
+      /*I*/ int (*is_valid_char) (const char *ch, size_t size);
+      /*I*/ void (*cnext_char) (const char **text);
+    void (*cprev_char) (const char **text);
+    void (*cnext_char_safe) (const char **text);
+      /*I*/ void (*cprev_char_safe) (const char **text);
       /*I*/ int (*cnext_noncomb_char) (const char **text);
       /*I*/ int (*cprev_noncomb_char) (const char **text, const char *begin);
-      /*I*/ gboolean (*char_isspace) (const char *);
-      /*I*/ gboolean (*char_ispunct) (const char *);
-      /*I*/ gboolean (*char_isalnum) (const char *);
-      /*I*/ gboolean (*char_isdigit) (const char *);
-      /*I*/ gboolean (*char_isprint) (const char *);
-      /*I*/ gboolean (*char_iscombiningmark) (const char *);
-      /*I*/ int (*length) (const char *);
-      /*I*/ int (*length2) (const char *, int);
-      /*I*/ int (*length_noncomb) (const char *);
-      /*I*/ gboolean (*char_toupper) (const char *, char **, size_t *);
-    gboolean (*char_tolower) (const char *, char **, size_t *);
-    void (*fix_string) (char *);
-      /*I*/ const char *(*term_form) (const char *);
-      /*I*/ const char *(*fit_to_term) (const char *, int, align_crt_t);
+      /*I*/ gboolean (*char_isspace) (const char *ch);
+      /*I*/ gboolean (*char_ispunct) (const char *ch);
+      /*I*/ gboolean (*char_isalnum) (const char *ch);
+      /*I*/ gboolean (*char_isdigit) (const char *ch);
+      /*I*/ gboolean (*char_isprint) (const char *ch);
+      /*I*/ gboolean (*char_iscombiningmark) (const char *ch);
+      /*I*/ int (*length) (const char *text);
+      /*I*/ int (*length2) (const char *text, int size);
+      /*I*/ int (*length_noncomb) (const char *text);
+      /*I*/ gboolean (*char_toupper) (const char *ch, char **out, size_t * remain);
+    gboolean (*char_tolower) (const char *ch, char **out, size_t * remain);
+    void (*fix_string) (char *text);
+      /*I*/ const char *(*term_form) (const char *text);
+      /*I*/ const char *(*fit_to_term) (const char *text, int width, align_crt_t just_mode);
       /*I*/ const char *(*term_trim) (const char *text, int width);
-      /*I*/ const char *(*term_substring) (const char *, int, int);
-      /*I*/ int (*term_width1) (const char *);
-      /*I*/ int (*term_width2) (const char *, size_t);
-      /*I*/ int (*term_char_width) (const char *);
-      /*I*/ const char *(*trunc) (const char *, int);
-      /*I*/ int (*offset_to_pos) (const char *, size_t);
-      /*I*/ int (*column_to_pos) (const char *, size_t);
-      /*I*/ char *(*create_search_needle) (const char *, gboolean);
-    void (*release_search_needle) (char *, gboolean);
-    const char *(*search_first) (const char *, const char *, gboolean);
-    const char *(*search_last) (const char *, const char *, gboolean);
-    int (*compare) (const char *, const char *);
-      /*I*/ int (*ncompare) (const char *, const char *);
-      /*I*/ int (*casecmp) (const char *, const char *);
-      /*I*/ int (*ncasecmp) (const char *, const char *);
-      /*I*/ int (*prefix) (const char *, const char *);
-      /*I*/ int (*caseprefix) (const char *, const char *);
+      /*I*/ const char *(*term_substring) (const char *text, int start, int width);
+      /*I*/ int (*term_width1) (const char *text);
+      /*I*/ int (*term_width2) (const char *text, size_t length);
+      /*I*/ int (*term_char_width) (const char *length);
+      /*I*/ const char *(*trunc) (const char *length, int width);
+      /*I*/ int (*offset_to_pos) (const char *text, size_t length);
+      /*I*/ int (*column_to_pos) (const char *text, size_t pos);
+      /*I*/ char *(*create_search_needle) (const char *needle, gboolean case_sen);
+    void (*release_search_needle) (char *needle, gboolean case_sen);
+    const char *(*search_first) (const char *text, const char *needle, gboolean case_sen);
+    const char *(*search_last) (const char *text, const char *needle, gboolean case_sen);
+    int (*compare) (const char *t1, const char *t2);
+      /*I*/ int (*ncompare) (const char *t1, const char *t2);
+      /*I*/ int (*casecmp) (const char *t1, const char *t2);
+      /*I*/ int (*ncasecmp) (const char *t1, const char *t2);
+      /*I*/ int (*prefix) (const char *text, const char *prefix);
+      /*I*/ int (*caseprefix) (const char *text, const char *prefix);
       /*I*/ char *(*create_key) (const char *text, gboolean case_sen);
       /*I*/ char *(*create_key_for_filename) (const char *text, gboolean case_sen);
       /*I*/ int (*key_collate) (const char *t1, const char *t2, gboolean case_sen);
@@ -171,17 +171,17 @@ struct str_class str_ascii_init (void);
 /* create convertor from "from_enc" to terminal encoding
  * if "from_enc" is not supported return INVALID_CONV 
  */
-GIConv str_crt_conv_from (const char *);
+GIConv str_crt_conv_from (const char *from_enc);
 
 /* create convertor from terminal encoding to "to_enc"
  * if "to_enc" is not supported return INVALID_CONV 
  */
-GIConv str_crt_conv_to (const char *);
+GIConv str_crt_conv_to (const char *to_enc);
 
 /* close convertor, do not close str_cnv_to_term, str_cnv_from_term, 
  * str_cnv_not_convert 
  */
-void str_close_conv (GIConv);
+void str_close_conv (GIConv conv);
 
 /* return on of not used buffers (.used == 0) or create new
  * returned buffer has set .used to 1
@@ -191,8 +191,8 @@ void str_close_conv (GIConv);
  * return ESTR_SUCCESS if there was no problem.
  * otherwise return  ESTR_PROBLEM or ESTR_FAILURE
  */
-estr_t str_convert (GIConv, const char *, GString *);
-estr_t str_nconvert (GIConv, const char *, int, GString *);
+estr_t str_convert (GIConv coder, const char *string, GString * buffer);
+estr_t str_nconvert (GIConv coder, const char *string, int size, GString * buffer);
 
 /* convert GError message (which in UTF-8) to terminal charset
  * def_char is used if result of error->str conversion if ESTR_FAILURE
@@ -206,13 +206,13 @@ gchar *str_conv_gerror_message (GError * error, const char *def_msg);
  * if coder is str_cnv_from_term or str_cnv_not_convert, string is only copied,
  * so is possible to show file, that is not valid in terminal encoding
  */
-estr_t str_vfs_convert_from (GIConv, const char *, GString *);
+estr_t str_vfs_convert_from (GIConv coder, const char *string, GString * buffer);
 
 /* if coder is str_cnv_to_term or str_cnv_not_convert, string is only copied,
  * does replace with questionmark 
  * I
  */
-estr_t str_vfs_convert_to (GIConv, const char *, int, GString *);
+estr_t str_vfs_convert_to (GIConv coder, const char *string, int size, GString * buffer);
 
 /* printf function for str_buffer, append result of printf at the end of buffer
  */
@@ -222,7 +222,7 @@ void str_printf (GString * buffer, const char *format, ...) G_GNUC_PRINTF (2, 3)
 
 /* add standard replacement character in terminal encoding
  */
-void str_insert_replace_char (GString *);
+void str_insert_replace_char (GString * buffer);
 
 /* init strings and set terminal encoding,
  * if is termenc NULL, detect terminal encoding
@@ -377,7 +377,7 @@ int str_length2 (const char *text, int size);
 /* return length of one char
  * I
  */
-int str_length_char (const char *);
+int str_length_char (const char *text);
 
 /* return length of text in characters, count only noncombining characters
  * I