diff --git a/lib/event.h b/lib/event.h index df6d857db..66616393e 100644 --- a/lib/event.h +++ b/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); diff --git a/lib/filehighlight.h b/lib/filehighlight.h index 980258898..aaee35164 100644 --- a/lib/filehighlight.h +++ b/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 ****************************************************************************/ diff --git a/lib/filehighlight/internal.h b/lib/filehighlight/internal.h index 80c852a59..0d96f9d92 100644 --- a/lib/filehighlight/internal.h +++ b/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 ****************************************************************************/ diff --git a/lib/search.h b/lib/search.h index 6e79609bc..4e7b7b2d8 100644 --- a/lib/search.h +++ b/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 */ diff --git a/lib/search/internal.h b/lib/search/internal.h index b6db46114..512c9d73d 100644 --- a/lib/search/internal.h +++ b/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 */ diff --git a/lib/search/search.c b/lib/search/search.c index d0a64d8d9..91bef34ab 100644 --- a/lib/search/search.c +++ b/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; diff --git a/lib/skin.h b/lib/skin.h index 155a8db9c..024e0c506 100644 --- a/lib/skin.h +++ b/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); diff --git a/lib/skin/internal.h b/lib/skin/internal.h index c12b34105..8b468db31 100644 --- a/lib/skin/internal.h +++ b/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 ****************************************************************************/ diff --git a/lib/strescape.h b/lib/strescape.h index 930b77d7f..a24f5d60c 100644 --- a/lib/strescape.h +++ b/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 */ diff --git a/lib/strutil.h b/lib/strutil.h index a091c25aa..60608f919 100644 --- a/lib/strutil.h +++ b/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 diff --git a/lib/timefmt.h b/lib/timefmt.h index 8cbf3e09d..d2bf1914a 100644 --- a/lib/timefmt.h +++ b/lib/timefmt.h @@ -52,7 +52,7 @@ extern char *user_old_timeformat; /* time format string for older dates */ /*** declarations of public functions ************************************************************/ size_t i18n_checktimelength (void); -const char *file_date (time_t); +const char *file_date (time_t when); /*** inline functions ****************************************************************************/ diff --git a/lib/tty/color-internal.h b/lib/tty/color-internal.h index acf911050..dc8522528 100644 --- a/lib/tty/color-internal.h +++ b/lib/tty/color-internal.h @@ -47,14 +47,15 @@ extern gboolean mc_tty_color_disable; /*** declarations of public functions ************************************************************/ -const char *tty_color_get_name_by_index (int); -int tty_color_get_index_by_name (const char *); -int tty_attr_get_bits (const char *); +const char *tty_color_get_name_by_index (int idx); +int tty_color_get_index_by_name (const char *color_name); +int tty_attr_get_bits (const char *attrs); -void tty_color_init_lib (gboolean, gboolean); +void tty_color_init_lib (gboolean disable, gboolean force); void tty_color_deinit_lib (void); -void tty_color_try_alloc_pair_lib (tty_color_pair_t *); +void tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair); /*** inline functions ****************************************************************************/ -#endif /* MC_COLOR_INTERNAL_H */ + +#endif /* MC__COLOR_INTERNAL_H */ diff --git a/lib/tty/color.h b/lib/tty/color.h index 57aef910e..138781f4a 100644 --- a/lib/tty/color.h +++ b/lib/tty/color.h @@ -35,8 +35,9 @@ void tty_init_colors (gboolean disable, gboolean force); void tty_colors_done (void); gboolean tty_use_colors (void); -int tty_try_alloc_color_pair (const char *, const char *, const char *); -int tty_try_alloc_color_pair2 (const char *, const char *, const char *, gboolean); +int tty_try_alloc_color_pair (const char *fg, const char *bg, const char *attrs); +int tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs, + gboolean is_temp_color); void tty_color_free_all_tmp (void); void tty_color_free_all_non_tmp (void); @@ -45,10 +46,11 @@ void tty_setcolor (int color); void tty_lowlevel_setcolor (int color); void tty_set_normal_attrs (void); -void tty_color_set_defaults (const char *, const char *, const char *); +void tty_color_set_defaults (const char *fgcolor, const char *bgcolor, const char *attrs); -extern gboolean tty_use_256colors (GError **); -extern gboolean tty_use_truecolors (GError **); +extern gboolean tty_use_256colors (GError ** error); +extern gboolean tty_use_truecolors (GError ** error); /*** inline functions ****************************************************************************/ -#endif /* MC_COLOR_H */ + +#endif /* MC__COLOR_H */ diff --git a/lib/tty/tty-internal.h b/lib/tty/tty-internal.h index 77546cd5f..a2cdfa7d7 100644 --- a/lib/tty/tty-internal.h +++ b/lib/tty/tty-internal.h @@ -38,7 +38,7 @@ extern int sigwinch_pipe[2]; void tty_create_winch_pipe (void); void tty_destroy_winch_pipe (void); -char *mc_tty_normalize_from_utf8 (const char *); +char *mc_tty_normalize_from_utf8 (const char *str); void tty_init_xterm_support (gboolean is_xterm); int tty_lowlevel_getch (void); diff --git a/lib/tty/tty.h b/lib/tty/tty.h index 4eba8f58f..90cbbc6c9 100644 --- a/lib/tty/tty.h +++ b/lib/tty/tty.h @@ -136,10 +136,11 @@ extern void tty_change_screen_size (void); /* Clear screen */ extern void tty_clear_screen (void); -extern int mc_tty_normalize_lines_char (const char *); +extern int mc_tty_normalize_lines_char (const char *str); extern void tty_enter_ca_mode (void); extern void tty_exit_ca_mode (void); /*** inline functions ****************************************************************************/ -#endif /* MC_TTY_H */ + +#endif /* MC__TTY_H */ diff --git a/lib/tty/x11conn.h b/lib/tty/x11conn.h index 774a800fd..fbfe15ae2 100644 --- a/lib/tty/x11conn.h +++ b/lib/tty/x11conn.h @@ -28,11 +28,13 @@ /*** declarations of public functions ************************************************************/ -extern Display *mc_XOpenDisplay (const char *); -extern int mc_XCloseDisplay (Display *); +extern Display *mc_XOpenDisplay (const char *displayname); +extern int mc_XCloseDisplay (Display * display); -extern Bool mc_XQueryPointer (Display *, Window, Window *, Window *, - int *, int *, int *, int *, unsigned int *); +extern Bool mc_XQueryPointer (Display * display, Window win, Window * root_return, + Window * child_return, int *root_x_return, int *root_y_return, + int *win_x_return, int *win_y_return, unsigned int *mask_return); /*** inline functions ****************************************************************************/ -#endif + +#endif /* MC__X11CONN_H */ diff --git a/lib/util.h b/lib/util.h index 18bec8203..f52f2adcf 100644 --- a/lib/util.h +++ b/lib/util.h @@ -223,16 +223,16 @@ void my_exit (int status); void save_stop_handler (void); /* Tilde expansion */ -char *tilde_expand (const char *); +char *tilde_expand (const char *directory); -void custom_canonicalize_pathname (char *, CANON_PATH_FLAGS); -void canonicalize_pathname (char *); +void custom_canonicalize_pathname (char *path, CANON_PATH_FLAGS flags); +void canonicalize_pathname (char *path); char *mc_realpath (const char *path, char *resolved_path); /* Looks for "magic" bytes at the start of the VFS file to guess the * compression type. Side effect: modifies the file position. */ -enum compression_type get_compression_type (int fd, const char *); +enum compression_type get_compression_type (int fd, const char *name); const char *decompress_extension (int type); GList *list_append_unique (GList * list, char *text); @@ -253,9 +253,9 @@ extern int ascii_alpha_to_cntrl (int ch); #undef Q_ const char *Q_ (const char *s); -gboolean mc_util_make_backup_if_possible (const char *, const char *); -gboolean mc_util_restore_from_backup_if_possible (const char *, const char *); -gboolean mc_util_unlink_backup_if_possible (const char *, const char *); +gboolean mc_util_make_backup_if_possible (const char *file_name, const char *backup_suffix); +gboolean mc_util_restore_from_backup_if_possible (const char *file_name, const char *backup_suffix); +gboolean mc_util_unlink_backup_if_possible (const char *file_name, const char *backup_suffix); char *guess_message_value (void); diff --git a/lib/vfs/path.h b/lib/vfs/path.h index e976c65be..d085e1a25 100644 --- a/lib/vfs/path.h +++ b/lib/vfs/path.h @@ -70,7 +70,7 @@ vfs_path_t *vfs_path_from_str_flags (const char *path_str, vfs_path_flag_t flags vfs_path_t *vfs_path_build_filename (const char *first_element, ...); vfs_path_t *vfs_path_append_new (const vfs_path_t * vpath, const char *first_element, ...); vfs_path_t *vfs_path_append_vpath_new (const vfs_path_t * first_vpath, ...); -size_t vfs_path_tokens_count (const vfs_path_t *); +size_t vfs_path_tokens_count (const vfs_path_t * vpath); char *vfs_path_tokens_get (const vfs_path_t * vpath, ssize_t start_position, ssize_t length); vfs_path_t *vfs_path_vtokens_get (const vfs_path_t * vpath, ssize_t start_position, ssize_t length); diff --git a/src/editor/editcmd_dialogs.h b/src/editor/editcmd_dialogs.h index 149ebc9ad..6d85e6bca 100644 --- a/src/editor/editcmd_dialogs.h +++ b/src/editor/editcmd_dialogs.h @@ -19,16 +19,16 @@ struct etags_hash_struct; /*** declarations of public functions ************************************************************/ -void editcmd_dialog_replace_show (WEdit *, const char *, const char *, char **, char **); - +void editcmd_dialog_replace_show (WEdit * edit, const char *search_default, + const char *replace_default, char **search_text, + char **replace_text); gboolean editcmd_dialog_search_show (WEdit * edit); - int editcmd_dialog_raw_key_query (const char *heading, const char *query, gboolean cancel); - char *editcmd_dialog_completion_show (const WEdit * edit, GQueue * compl, int max_width); - void editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, GPtrArray * def_hash); +int editcmd_dialog_replace_prompt_show (WEdit * edit, char *from_text, char *to_text, int xpos, + int ypos); -int editcmd_dialog_replace_prompt_show (WEdit *, char *, char *, int, int); /*** inline functions ****************************************************************************/ + #endif /* MC__EDITCMD_DIALOGS_H */ diff --git a/src/events_init.h b/src/events_init.h index 750891038..f2d447e24 100644 --- a/src/events_init.h +++ b/src/events_init.h @@ -12,7 +12,7 @@ /*** declarations of public functions ************************************************************/ -gboolean events_init (GError **); +gboolean events_init (GError ** mcerror); /*** inline functions ****************************************************************************/ diff --git a/src/filemanager/panel.h b/src/filemanager/panel.h index abfac30ac..039950486 100644 --- a/src/filemanager/panel.h +++ b/src/filemanager/panel.h @@ -192,12 +192,12 @@ gboolean panel_do_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_ gboolean panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type); gsize panel_get_num_of_sortable_fields (void); -char **panel_get_sortable_fields (gsize *); -const panel_field_t *panel_get_field_by_id (const char *); -const panel_field_t *panel_get_field_by_title (const char *); -const panel_field_t *panel_get_field_by_title_hotkey (const char *); +char **panel_get_sortable_fields (gsize * array_size); +const panel_field_t *panel_get_field_by_id (const char *name); +const panel_field_t *panel_get_field_by_title (const char *name); +const panel_field_t *panel_get_field_by_title_hotkey (const char *name); gsize panel_get_num_of_user_possible_fields (void); -char **panel_get_user_possible_fields (gsize *); +char **panel_get_user_possible_fields (gsize * array_size); void panel_set_cwd (WPanel * panel, const vfs_path_t * vpath); void panel_set_lwd (WPanel * panel, const vfs_path_t * vpath); diff --git a/src/usermenu.h b/src/usermenu.h index f689f16fd..028cd8866 100644 --- a/src/usermenu.h +++ b/src/usermenu.h @@ -21,9 +21,9 @@ gboolean user_menu_cmd (const WEdit * edit_widget, const char *menu_file, int selected_entry); char *expand_format (const WEdit * edit_widget, char c, gboolean do_quote); -int check_format_view (const char *); -int check_format_var (const char *, char **); -int check_format_cd (const char *); +int check_format_view (const char *p); +int check_format_var (const char *p, char **v); +int check_format_cd (const char *p); /*** inline functions ****************************************************************************/ diff --git a/src/viewer/internal.h b/src/viewer/internal.h index 8d277fe55..2b68e04b2 100644 --- a/src/viewer/internal.h +++ b/src/viewer/internal.h @@ -232,12 +232,12 @@ cb_ret_t mcview_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, void *data); /* ascii.c: */ -void mcview_display_text (WView *); +void mcview_display_text (WView * view); void mcview_state_machine_init (mcview_state_machine_t *, off_t); -void mcview_ascii_move_down (WView *, off_t); -void mcview_ascii_move_up (WView *, off_t); -void mcview_ascii_moveto_bol (WView *); -void mcview_ascii_moveto_eol (WView *); +void mcview_ascii_move_down (WView * view, off_t lines); +void mcview_ascii_move_up (WView * view, off_t lines); +void mcview_ascii_moveto_bol (WView * view); +void mcview_ascii_moveto_eol (WView * view); /* coord_cache.c: */ coord_cache_t *coord_cache_new (void); @@ -250,21 +250,21 @@ void mcview_ccache_dump (WView * view); void mcview_ccache_lookup (WView * view, coord_cache_entry_t * coord, enum ccache_type lookup_what); /* datasource.c: */ -void mcview_set_datasource_none (WView *); -off_t mcview_get_filesize (WView *); +void mcview_set_datasource_none (WView * view); +off_t mcview_get_filesize (WView * view); void mcview_update_filesize (WView * view); -char *mcview_get_ptr_file (WView *, off_t); -char *mcview_get_ptr_string (WView *, off_t); +char *mcview_get_ptr_file (WView * view, off_t byte_index); +char *mcview_get_ptr_string (WView * view, off_t byte_index); gboolean mcview_get_utf (WView * view, off_t byte_index, int *ch, int *ch_len); -gboolean mcview_get_byte_string (WView *, off_t, int *); -gboolean mcview_get_byte_none (WView *, off_t, int *); -void mcview_set_byte (WView *, off_t, byte); -void mcview_file_load_data (WView *, off_t); -void mcview_close_datasource (WView *); -void mcview_set_datasource_file (WView *, int, const struct stat *); -gboolean mcview_load_command_output (WView *, const char *); -void mcview_set_datasource_vfs_pipe (WView *, int); -void mcview_set_datasource_string (WView *, const char *); +gboolean mcview_get_byte_string (WView * view, off_t byte_index, int *retval); +gboolean mcview_get_byte_none (WView * view, off_t byte_index, int *retval); +void mcview_set_byte (WView * view, off_t offset, byte b); +void mcview_file_load_data (WView * view, off_t byte_index); +void mcview_close_datasource (WView * view); +void mcview_set_datasource_file (WView * view, int fd, const struct stat *st); +gboolean mcview_load_command_output (WView * view, const char *command); +void mcview_set_datasource_vfs_pipe (WView * view, int fd); +void mcview_set_datasource_string (WView * view, const char *s); /* dialog.c: */ gboolean mcview_dialog_search (WView * view); @@ -284,16 +284,16 @@ void mcview_growbuf_init (WView * view); void mcview_growbuf_done (WView * view); void mcview_growbuf_free (WView * view); off_t mcview_growbuf_filesize (WView * view); -void mcview_growbuf_read_until (WView * view, off_t p); -gboolean mcview_get_byte_growing_buffer (WView * view, off_t p, int *); -char *mcview_get_ptr_growing_buffer (WView * view, off_t p); +void mcview_growbuf_read_until (WView * view, off_t ofs); +gboolean mcview_get_byte_growing_buffer (WView * view, off_t byte_index, int *retval); +char *mcview_get_ptr_growing_buffer (WView * view, off_t byte_index); /* hex.c: */ void mcview_display_hex (WView * view); gboolean mcview_hexedit_save_changes (WView * view); void mcview_toggle_hexedit_mode (WView * view); void mcview_hexedit_free_change_list (WView * view); -void mcview_enqueue_change (struct hexedit_change_node **, struct hexedit_change_node *); +void mcview_enqueue_change (struct hexedit_change_node **head, struct hexedit_change_node *node); /* lib.c: */ void mcview_toggle_magic_mode (WView * view); @@ -313,29 +313,29 @@ char *mcview_get_title (const WDialog * h, size_t len); int mcview_calc_percent (WView * view, off_t p); /* move.c */ -void mcview_move_up (WView *, off_t); -void mcview_move_down (WView *, off_t); -void mcview_move_left (WView *, off_t); -void mcview_move_right (WView *, off_t); -void mcview_moveto_top (WView *); -void mcview_moveto_bottom (WView *); -void mcview_moveto_bol (WView *); -void mcview_moveto_eol (WView *); -void mcview_moveto_offset (WView *, off_t); -void mcview_moveto (WView *, off_t, off_t); -void mcview_coord_to_offset (WView *, off_t *, off_t, off_t); -void mcview_offset_to_coord (WView *, off_t *, off_t *, off_t); -void mcview_place_cursor (WView *); -void mcview_moveto_match (WView *); +void mcview_move_up (WView * view, off_t lines); +void mcview_move_down (WView * view, off_t lines); +void mcview_move_left (WView * view, off_t columns); +void mcview_move_right (WView * view, off_t columns); +void mcview_moveto_top (WView * view); +void mcview_moveto_bottom (WView * view); +void mcview_moveto_bol (WView * view); +void mcview_moveto_eol (WView * view); +void mcview_moveto_offset (WView * view, off_t offset); +void mcview_moveto (WView * view, off_t, off_t col); +void mcview_coord_to_offset (WView * view, off_t * ret_offset, off_t line, off_t column); +void mcview_offset_to_coord (WView * view, off_t * ret_line, off_t * ret_column, off_t offset); +void mcview_place_cursor (WView * view); +void mcview_moveto_match (WView * view); /* nroff.c: */ -int mcview__get_nroff_real_len (WView * view, off_t, off_t p); -mcview_nroff_t *mcview_nroff_seq_new_num (WView * view, off_t p); +int mcview__get_nroff_real_len (WView * view, off_t start, off_t length); +mcview_nroff_t *mcview_nroff_seq_new_num (WView * view, off_t lc_index); mcview_nroff_t *mcview_nroff_seq_new (WView * view); -void mcview_nroff_seq_free (mcview_nroff_t **); -nroff_type_t mcview_nroff_seq_info (mcview_nroff_t *); -int mcview_nroff_seq_next (mcview_nroff_t *); -int mcview_nroff_seq_prev (mcview_nroff_t *); +void mcview_nroff_seq_free (mcview_nroff_t ** nroff); +nroff_type_t mcview_nroff_seq_info (mcview_nroff_t * nroff); +int mcview_nroff_seq_next (mcview_nroff_t * nroff); +int mcview_nroff_seq_prev (mcview_nroff_t * nroff); /* search.c: */ mc_search_cbret_t mcview_search_cmd_callback (const void *user_data, gsize char_offset,