From fa421e065ac811ce499f9fa881ec8aad80d7dfe7 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Fri, 21 Dec 2012 13:13:52 +0400 Subject: [PATCH] Indentation. Signed-off-by: Andrew Borodin --- lib/mcconfig/paths.c | 2 +- lib/search/search.c | 2 +- lib/vfs/vfs.h | 2 ++ lib/vfs/xdirentry.h | 2 ++ src/editor/editcmd.c | 2 +- src/filemanager/filegui.c | 3 ++- src/filemanager/midnight.c | 2 +- src/filemanager/mountlist.c | 3 ++- src/main.c | 2 +- 9 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c index 6d6097d6a..d022498cb 100644 --- a/lib/mcconfig/paths.c +++ b/lib/mcconfig/paths.c @@ -485,7 +485,7 @@ mc_config_migrate_from_old_place (GError ** error, char **msg) "to Freedesktop recommended dirs.\n" "To get more info, please visit\n" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html"), - old_dir); + old_dir); #else /* MC_HOMEDIR_XDG */ *msg = g_strdup_printf (_("Your old settings were migrated from %s\n" "to %s\n"), old_dir, mc_config_str); diff --git a/lib/search/search.c b/lib/search/search.c index 434e57247..4f30f26ab 100644 --- a/lib/search/search.c +++ b/lib/search/search.c @@ -388,7 +388,7 @@ mc_search (const gchar * pattern, const gchar * str, mc_search_type_t type) return FALSE; search = mc_search_new (pattern, -1); - if (search == NULL ) + if (search == NULL) return FALSE; search->search_type = type; diff --git a/lib/vfs/vfs.h b/lib/vfs/vfs.h index 84f1ccf22..757549cfa 100644 --- a/lib/vfs/vfs.h +++ b/lib/vfs/vfs.h @@ -137,6 +137,7 @@ typedef struct vfs_class void *data; /* this is for filesystem's own use */ int verrno; /* can't use errno because glibc2 might define errno as function */ + /* *INDENT-OFF* */ int (*init) (struct vfs_class * me); void (*done) (struct vfs_class * me); @@ -193,6 +194,7 @@ typedef struct vfs_class int (*ctl) (void *vfs_info, int ctlop, void *arg); int (*setctl) (const vfs_path_t * vpath, int ctlop, void *arg); + /* *INDENT-ON* */ } vfs_class; /* diff --git a/lib/vfs/xdirentry.h b/lib/vfs/xdirentry.h index 1ef473a9a..c1b2c9b1d 100644 --- a/lib/vfs/xdirentry.h +++ b/lib/vfs/xdirentry.h @@ -124,6 +124,7 @@ struct vfs_s_subclass FILE *logfile; int flush; /* if set to 1, invalidate directory cache */ + /* *INDENT-OFF* */ int (*init_inode) (struct vfs_class * me, struct vfs_s_inode * ino); /* optional */ void (*free_inode) (struct vfs_class * me, struct vfs_s_inode * ino); /* optional */ int (*init_entry) (struct vfs_class * me, struct vfs_s_entry * entry); /* optional */ @@ -149,6 +150,7 @@ struct vfs_s_subclass int (*linear_start) (struct vfs_class * me, vfs_file_handler_t * fh, off_t from); ssize_t (*linear_read) (struct vfs_class * me, vfs_file_handler_t * fh, void *buf, size_t len); void (*linear_close) (struct vfs_class * me, vfs_file_handler_t * fh); + /* *INDENT-ON* */ }; /*** global variables defined in .c file *********************************************************/ diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index 9632ffa67..e02f83f12 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -2376,7 +2376,7 @@ edit_block_move_cmd (WEdit * edit) if (eval_marks (edit, &start_mark, &end_mark)) return; - if (!edit->column_highlight && edit->curs1 > start_mark && edit->curs1 < end_mark) + if (!edit->column_highlight && edit->curs1 > start_mark && edit->curs1 < end_mark) return; line = edit->curs_line; diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c index aaf77cddb..6e4aeb5c6 100644 --- a/src/filemanager/filegui.c +++ b/src/filemanager/filegui.c @@ -615,7 +615,8 @@ check_progress_buttons (FileOpContext * ctx) /* {{{ File progress display routines */ void -file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta, filegui_dialog_type_t dialog_type) +file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta, + filegui_dialog_type_t dialog_type) { FileOpContextUI *ui; diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index c4012ee0d..3922d6f48 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -1054,7 +1054,7 @@ quit_cmd_internal (int quiet) #ifdef HAVE_SUBSHELL_SUPPORT if (!mc_global.tty.use_subshell) stop_dialogs (); - else if ((q = exit_subshell () ? 1 : 0) != 0) + else if ((q = exit_subshell ()? 1 : 0) != 0) #endif stop_dialogs (); } diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c index 85d57b22c..daaee8b68 100644 --- a/src/filemanager/mountlist.c +++ b/src/filemanager/mountlist.c @@ -811,7 +811,8 @@ read_file_system_list (int need_fs_type) break; me = g_malloc (sizeof (*me)); - me->me_devname = g_strdup (fi.device_name[0] != '\0' ? fi.device_name : fi.fsh_name); + me->me_devname = + g_strdup (fi.device_name[0] != '\0' ? fi.device_name : fi.fsh_name); me->me_mountdir = g_strdup (re != NULL ? re->name : fi.fsh_name); me->me_type = g_strdup (fi.fsh_name); me->me_type_malloced = 1; diff --git a/src/main.c b/src/main.c index ce186ee7b..cd325658a 100644 --- a/src/main.c +++ b/src/main.c @@ -570,7 +570,7 @@ main (int argc, char *argv[]) if (mc_global.midnight_shutdown) exit_code = EXIT_SUCCESS; else - exit_code = do_nc () ? EXIT_SUCCESS : EXIT_FAILURE; + exit_code = do_nc ()? EXIT_SUCCESS : EXIT_FAILURE; /* Save the tree store */ (void) tree_store_save ();