mirror of https://github.com/MidnightCommander/mc
Indentation using GNU indent-2.2.13.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
ce299bbee9
commit
6718b3ec26
|
@ -56,8 +56,7 @@ static const struct
|
|||
{
|
||||
char **basedir;
|
||||
const char *filename;
|
||||
} mc_config_files_reference[] =
|
||||
{
|
||||
} mc_config_files_reference[] = {
|
||||
/* *INDENT-OFF* */
|
||||
/* config */
|
||||
{ &mc_config_str, MC_CONFIG_FILE },
|
||||
|
|
|
@ -110,8 +110,7 @@ mc_config_set_string (mc_config_t * mc_config, const gchar * group,
|
|||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
void
|
||||
mc_config_set_bool (mc_config_t * mc_config, const gchar * group,
|
||||
const gchar * param, gboolean value)
|
||||
mc_config_set_bool (mc_config_t *mc_config, const gchar *group, const gchar *param, gboolean value)
|
||||
{
|
||||
if (mc_config != NULL && group != NULL && param != NULL)
|
||||
g_key_file_set_boolean (mc_config->handle, group, param, value);
|
||||
|
|
|
@ -65,8 +65,7 @@ typedef enum
|
|||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
static gboolean
|
||||
mc_search__regex_str_append_if_special (GString * copy_to, const GString * regex_str,
|
||||
gsize * offset)
|
||||
mc_search__regex_str_append_if_special (GString *copy_to, const GString *regex_str, gsize *offset)
|
||||
{
|
||||
const char *special_chars[] = {
|
||||
"\\s", "\\S",
|
||||
|
@ -685,8 +684,7 @@ mc_search_regex__process_append_str (GString * dest_str, const char *from, gsize
|
|||
|
||||
static void
|
||||
mc_search_regex__process_escape_sequence (GString *dest_str, const char *from, gsize len,
|
||||
replace_transform_type_t * replace_flags,
|
||||
gboolean is_utf8)
|
||||
replace_transform_type_t *replace_flags, gboolean is_utf8)
|
||||
{
|
||||
gsize i = 0;
|
||||
unsigned int c = 0;
|
||||
|
|
|
@ -94,8 +94,7 @@ static const struct
|
|||
{
|
||||
int key_code;
|
||||
const char *key_name;
|
||||
} key_table[] =
|
||||
{
|
||||
} key_table[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ KEY_F (0), "k0" },
|
||||
{ KEY_F (1), "k1" },
|
||||
|
|
|
@ -452,11 +452,12 @@ size_trunc_len (char *buffer, unsigned int len, uintmax_t size, int units, gbool
|
|||
*/
|
||||
#endif
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
|
||||
static const char *const suffix[] =
|
||||
{ "", "K", "M", "G", "T", "P", "E", "Z", "Y", "R", "Q", NULL };
|
||||
static const char *const suffix_lc[] =
|
||||
{ "", "k", "m", "g", "t", "p", "e", "z", "y", "r", "q", NULL };
|
||||
/* *INDENT-ON* */
|
||||
|
||||
const char *const *sfx = use_si ? suffix_lc : suffix;
|
||||
int j = 0;
|
||||
|
|
|
@ -445,8 +445,7 @@ mc_args__convert_help_to_syscharset (const gchar * charset, const gchar * error_
|
|||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
static gboolean
|
||||
parse_mc_e_argument (const gchar * option_name, const gchar * value, gpointer data,
|
||||
GError ** mcerror)
|
||||
parse_mc_e_argument (const gchar *option_name, const gchar *value, gpointer data, GError **mcerror)
|
||||
{
|
||||
(void) option_name;
|
||||
(void) value;
|
||||
|
@ -462,8 +461,7 @@ parse_mc_e_argument (const gchar * option_name, const gchar * value, gpointer da
|
|||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
static gboolean
|
||||
parse_mc_v_argument (const gchar * option_name, const gchar * value, gpointer data,
|
||||
GError ** mcerror)
|
||||
parse_mc_v_argument (const gchar *option_name, const gchar *value, gpointer data, GError **mcerror)
|
||||
{
|
||||
(void) option_name;
|
||||
(void) value;
|
||||
|
|
|
@ -804,8 +804,7 @@ scan_diff (FBUF * f, GArray * ops)
|
|||
*/
|
||||
|
||||
static int
|
||||
dff_execute (const char *args, const char *extra, const char *file1, const char *file2,
|
||||
GArray * ops)
|
||||
dff_execute (const char *args, const char *extra, const char *file1, const char *file2, GArray *ops)
|
||||
{
|
||||
static const char *opt =
|
||||
" --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
|
||||
|
|
|
@ -134,8 +134,7 @@ const char VERTICAL_MAGIC[] = { '\1', '\1', '\1', '\1', '\n' };
|
|||
static const struct edit_filters
|
||||
{
|
||||
const char *read, *write, *extension;
|
||||
} all_filters[] =
|
||||
{
|
||||
} all_filters[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ "xz -cd %s 2>&1", "xz > %s", ".xz"},
|
||||
{ "zstd -cd %s 2>&1", "zstd > %s", ".zst"},
|
||||
|
|
|
@ -394,8 +394,7 @@ edit_buffer_get_eol (const edit_buffer_t * buf, off_t current)
|
|||
*/
|
||||
|
||||
GString *
|
||||
edit_buffer_get_word_from_pos (const edit_buffer_t * buf, off_t start_pos, off_t * start,
|
||||
gsize * cut)
|
||||
edit_buffer_get_word_from_pos (const edit_buffer_t *buf, off_t start_pos, off_t *start, gsize *cut)
|
||||
{
|
||||
off_t word_start;
|
||||
gsize cut_len = 0;
|
||||
|
|
|
@ -756,8 +756,7 @@ edit_syntax_onoff_cb (void *data, void *user_data)
|
|||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
static cb_ret_t
|
||||
editcmd_dialog_raw_key_query_cb (Widget * w, Widget * sender, widget_msg_t msg, int parm,
|
||||
void *data)
|
||||
editcmd_dialog_raw_key_query_cb (Widget *w, Widget *sender, widget_msg_t msg, int parm, void *data)
|
||||
{
|
||||
WDialog *h = DIALOG (w);
|
||||
|
||||
|
|
|
@ -105,8 +105,7 @@ static struct
|
|||
{
|
||||
const char *code;
|
||||
const char *name;
|
||||
} spell_codes_map[] =
|
||||
{
|
||||
} spell_codes_map[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{"br", N_("Breton")},
|
||||
{"cs", N_("Czech")},
|
||||
|
|
|
@ -74,8 +74,7 @@ static struct
|
|||
int x;
|
||||
int len;
|
||||
const char *text;
|
||||
} advanced_chown_but[BUTTONS] =
|
||||
{
|
||||
} advanced_chown_but[BUTTONS] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ 0, B_ENTER, NARROW_BUTTON, 3, 0, " " },
|
||||
{ 0, B_ENTER, NARROW_BUTTON, 11, 0, " " },
|
||||
|
|
|
@ -1284,8 +1284,7 @@ jobs_box (void)
|
|||
int len;
|
||||
bcback_fn callback;
|
||||
}
|
||||
job_but[] =
|
||||
{
|
||||
job_but[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ N_("&Stop"), NORMAL_BUTTON, B_STOP, 0, task_cb },
|
||||
{ N_("&Resume"), NORMAL_BUTTON, B_RESUME, 0, task_cb },
|
||||
|
|
|
@ -137,8 +137,7 @@ static struct
|
|||
const char *text;
|
||||
gboolean selected;
|
||||
gboolean state; /* state of checkboxes */
|
||||
} check_attr[] =
|
||||
{
|
||||
} check_attr[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ EXT2_SECRM_FL, 's', N_("Secure deletion"), FALSE, FALSE },
|
||||
{ EXT2_UNRM_FL, 'u', N_("Undelete"), FALSE, FALSE },
|
||||
|
@ -224,8 +223,7 @@ static struct
|
|||
int width;
|
||||
const char *text;
|
||||
Widget *button;
|
||||
} chattr_but[BUTTONS] =
|
||||
{
|
||||
} chattr_but[BUTTONS] = {
|
||||
/* *INDENT-OFF* */
|
||||
/* 0 */ { B_SETALL, NORMAL_BUTTON, 0, N_("Set &all"), NULL },
|
||||
/* 1 */ { B_MARKED, NORMAL_BUTTON, 0, N_("&Marked all"), NULL },
|
||||
|
|
|
@ -70,8 +70,7 @@ static struct
|
|||
const char *text;
|
||||
gboolean selected;
|
||||
WCheck *check;
|
||||
} check_perm[BUTTONS_PERM] =
|
||||
{
|
||||
} check_perm[BUTTONS_PERM] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ S_ISUID, N_("set &user ID on execution"), FALSE, NULL },
|
||||
{ S_ISGID, N_("set &group ID on execution"), FALSE, NULL },
|
||||
|
@ -106,8 +105,7 @@ static struct
|
|||
int y; /* vertical position relatively to dialog bottom boundary */
|
||||
int len;
|
||||
const char *text;
|
||||
} chmod_but[BUTTONS] =
|
||||
{
|
||||
} chmod_but[BUTTONS] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ B_SETALL, NORMAL_BUTTON, 6, 0, N_("Set &all") },
|
||||
{ B_MARKED, NORMAL_BUTTON, 6, 0, N_("&Marked all") },
|
||||
|
|
|
@ -78,8 +78,7 @@ static struct
|
|||
int y;
|
||||
int len;
|
||||
const char *text;
|
||||
} chown_but[BUTTONS] =
|
||||
{
|
||||
} chown_but[BUTTONS] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ B_SETALL, NORMAL_BUTTON, 5, 0, N_("Set &all") },
|
||||
{ B_SETGRP, NORMAL_BUTTON, 5, 0, N_("Set &groups") },
|
||||
|
@ -96,8 +95,7 @@ static struct
|
|||
{
|
||||
int y;
|
||||
WLabel *l;
|
||||
} chown_label[LABELS] =
|
||||
{
|
||||
} chown_label[LABELS] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ 4, NULL },
|
||||
{ 6, NULL },
|
||||
|
|
|
@ -246,8 +246,7 @@ static struct
|
|||
const char *text;
|
||||
button_flags_t flags;
|
||||
int len;
|
||||
} progress_buttons[] =
|
||||
{
|
||||
} progress_buttons[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ NULL, FILE_SKIP, N_("&Skip"), NORMAL_BUTTON, -1 },
|
||||
{ NULL, FILE_SUSPEND, N_("S&uspend"), NORMAL_BUTTON, -1 },
|
||||
|
@ -454,8 +453,7 @@ overwrite_query_dialog (file_op_context_t * ctx, enum OperationMode mode)
|
|||
int x;
|
||||
widget_pos_flags_t pos_flags;
|
||||
int value; /* 0 for labels and checkbox */
|
||||
} dlg_widgets[] =
|
||||
{
|
||||
} dlg_widgets[] = {
|
||||
/* *INDENT-OFF* */
|
||||
/* 0 - label */
|
||||
{ NULL, N_("New :"), 2, 3, WPOS_KEEP_DEFAULT, 0 },
|
||||
|
|
|
@ -1409,8 +1409,7 @@ do_search (WDialog * h)
|
|||
}
|
||||
}
|
||||
|
||||
search_ok =
|
||||
mc_search_run (search_file_handle, dp->d_name, 0, dp->d_len, &bytes_found);
|
||||
search_ok = mc_search_run (search_file_handle, dp->d_name, 0, dp->d_len, &bytes_found);
|
||||
|
||||
if (search_ok)
|
||||
{
|
||||
|
|
|
@ -167,8 +167,7 @@ static struct
|
|||
const char *text;
|
||||
int type;
|
||||
widget_pos_flags_t pos_flags;
|
||||
} hotlist_but[] =
|
||||
{
|
||||
} hotlist_but[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ B_ENTER, DEFPUSH_BUTTON, 0, 0, 0, N_("Change &to"),
|
||||
LIST_HOTLIST | LIST_VFSLIST | LIST_MOVELIST, WPOS_KEEP_LEFT | WPOS_KEEP_BOTTOM },
|
||||
|
|
|
@ -145,8 +145,7 @@ static struct
|
|||
panel_view_mode_t type;
|
||||
Widget *widget;
|
||||
char *last_saved_dir; /* last view_list working directory */
|
||||
} panels[MAX_VIEWS] =
|
||||
{
|
||||
} panels[MAX_VIEWS] = {
|
||||
/* *INDENT-OFF* */
|
||||
/* init MAX_VIEWS items */
|
||||
{ view_listing, NULL, NULL},
|
||||
|
@ -169,8 +168,7 @@ static struct
|
|||
const char *text;
|
||||
gboolean *variable;
|
||||
WCheck *widget;
|
||||
} check_options[] =
|
||||
{
|
||||
} check_options[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ N_("&Equal split"), &equal_split, NULL },
|
||||
{ N_("&Menubar visible"), &menubar_visible, NULL },
|
||||
|
|
|
@ -163,8 +163,7 @@ external_panelize_init (void)
|
|||
int ret_cmd;
|
||||
button_flags_t flags;
|
||||
const char *text;
|
||||
} panelize_but[] =
|
||||
{
|
||||
} panelize_but[] = {
|
||||
/* *INDENT-OFF* */
|
||||
{ B_ENTER, DEFPUSH_BUTTON, N_("Pane&lize") },
|
||||
{ B_REMOVE, NORMAL_BUTTON, N_("&Remove") },
|
||||
|
|
|
@ -125,7 +125,8 @@ select_charset (int center_y, int center_x, int current_charset, gboolean seldis
|
|||
/* some charset has been selected */
|
||||
if (seldisplay)
|
||||
/* charset list is finished with "Other 8 bit" item */
|
||||
return (listbox_result >= (int) codepages->len) ? SELECT_CHARSET_OTHER_8BIT : listbox_result;
|
||||
return (listbox_result >=
|
||||
(int) codepages->len) ? SELECT_CHARSET_OTHER_8BIT : listbox_result;
|
||||
|
||||
/* charset list is began with "- < No translation >" item */
|
||||
return (listbox_result - 1);
|
||||
|
|
|
@ -334,8 +334,7 @@ mcview_update_bytes_per_line (WView * view)
|
|||
void
|
||||
mcview_display_toggle_ruler (WView *view)
|
||||
{
|
||||
static const enum ruler_type next[3] =
|
||||
{
|
||||
static const enum ruler_type next[3] = {
|
||||
RULER_TOP,
|
||||
RULER_BOTTOM,
|
||||
RULER_NONE
|
||||
|
|
Loading…
Reference in New Issue