Cleanup of code for master
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Этот коммит содержится в:
родитель
45c1704b9e
Коммит
1b75ea27b6
@ -210,7 +210,7 @@ extfs_find_entry_int (struct entry *dir, char *name, GSList *list,
|
|||||||
|
|
||||||
if (g_path_is_absolute (name)) {
|
if (g_path_is_absolute (name)) {
|
||||||
/* Handle absolute paths */
|
/* Handle absolute paths */
|
||||||
name = g_path_skip_root (name);
|
name = (char *) g_path_skip_root (name);
|
||||||
dir = dir->inode->archive->root_entry;
|
dir = dir->inode->archive->root_entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -249,7 +249,6 @@ chown_cmd (void)
|
|||||||
{
|
{
|
||||||
char *fname;
|
char *fname;
|
||||||
struct stat sf_stat;
|
struct stat sf_stat;
|
||||||
WLEntry *fe;
|
|
||||||
Dlg_head *ch_dlg;
|
Dlg_head *ch_dlg;
|
||||||
uid_t new_user;
|
uid_t new_user;
|
||||||
gid_t new_group;
|
gid_t new_group;
|
||||||
|
@ -2415,7 +2415,7 @@ static int edit_find_word_start (WEdit *edit, long *word_start, gsize *word_len)
|
|||||||
/* search start of word to be completed */
|
/* search start of word to be completed */
|
||||||
for (i = 2;; i++) {
|
for (i = 2;; i++) {
|
||||||
/* return if at begin of file */
|
/* return if at begin of file */
|
||||||
if (edit->curs1 - i < 0)
|
if ((gsize)edit->curs1 < i)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
last = c;
|
last = c;
|
||||||
|
@ -151,6 +151,8 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha
|
|||||||
void
|
void
|
||||||
editcmd_dialog_search_show (WEdit * edit, char **search_text)
|
editcmd_dialog_search_show (WEdit * edit, char **search_text)
|
||||||
{
|
{
|
||||||
|
(void) edit;
|
||||||
|
|
||||||
if (*search_text == '\0')
|
if (*search_text == '\0')
|
||||||
*search_text = INPUT_LAST_TEXT;
|
*search_text = INPUT_LAST_TEXT;
|
||||||
|
|
||||||
@ -466,7 +468,7 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_l
|
|||||||
char *tmp_curr_def = (char *) curr_def;
|
char *tmp_curr_def = (char *) curr_def;
|
||||||
int do_moveto = 0;
|
int do_moveto = 0;
|
||||||
|
|
||||||
listbox_get_current (def_list, &curr, &tmp_curr_def);
|
listbox_get_current (def_list, &curr, (void **) &tmp_curr_def);
|
||||||
curr_def = (etags_hash_t *) tmp_curr_def;
|
curr_def = (etags_hash_t *) tmp_curr_def;
|
||||||
if (edit->modified) {
|
if (edit->modified) {
|
||||||
if (!edit_query_dialog2
|
if (!edit_query_dialog2
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
#include "lib/global.h"
|
#include "lib/global.h"
|
||||||
#include "fileopctx.h"
|
#include "fileopctx.h"
|
||||||
|
#include "filegui.h"
|
||||||
#include "lib/search.h"
|
#include "lib/search.h"
|
||||||
#include "lib/vfs/mc-vfs/vfs.h"
|
#include "lib/vfs/mc-vfs/vfs.h"
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ mcview_display_status (mcview_t * view)
|
|||||||
const screen_dimen width = view->status_area.width;
|
const screen_dimen width = view->status_area.width;
|
||||||
const screen_dimen height = view->status_area.height;
|
const screen_dimen height = view->status_area.height;
|
||||||
const char *file_label;
|
const char *file_label;
|
||||||
screen_dimen file_label_width, i = 0;
|
screen_dimen file_label_width;
|
||||||
|
|
||||||
if (height < 1)
|
if (height < 1)
|
||||||
return;
|
return;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user