Ticket #2097: 2097-src-help.c-interactive_display-rm-UNused-argument.patch

File 2097-src-help.c-interactive_display-rm-UNused-argument.patch, 4.4 KB (added by vit_r, 14 years ago)

src/help.c interactive_display () removing UN used argument

  • src/cmd.c 

    From f8741cf7eb3ec9a6618989b9ab5814548b0f4d9d Mon Sep 17 00:00:00 2001
From: Vit Rosin <vit_r@list.ru>
Date: Sun, 14 Mar 2010 19:53:52 +0000
Subject: [PATCH] src/help.c interactive_display () removing UN used argument

---
 src/cmd.c                |    4 ++--
 src/dialog.c             |    2 +-
 src/editor/editcmd.c     |    2 +-
 src/help.c               |    9 +++------
 src/help.h               |    2 +-
 src/menu.c               |    5 ++---
 src/tree.c               |    2 +-
 src/viewer/actions_cmd.c |    2 +-
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/cmd.c b/src/cmd.c
index 3436778..b95070b 100644
    a b void edit_symlink_cmd (void) 
    10201020void help_cmd (void) 
    10211021{ 
    10221022    if (current_panel->searching) 
    1023        interactive_display (NULL, "[Quick search]"); 
     1023       interactive_display ("[Quick search]"); 
    10241024    else 
    1025        interactive_display (NULL, "[main]"); 
     1025       interactive_display ("[main]"); 
    10261026} 
    10271027 
    10281028void 

  • src/dialog.c 

    diff --git a/src/dialog.c b/src/dialog.c
index 56b200f..fe8a71a 100644
    a b dialog_handle_key (Dlg_head *h, int d_key) 
    610610        break; 
    611611 
    612612    case KEY_F(1): 
    613         interactive_display (NULL, h->help_ctx); 
     613        interactive_display (h->help_ctx); 
    614614        do_refresh (); 
    615615        break; 
    616616 

  • src/editor/editcmd.c 

    diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 81331e9..be2606b 100644
    a b edit_search_cmd_callback (const void *user_data, gsize char_offset) 
    129129void 
    130130edit_help_cmd (WEdit * edit) 
    131131{ 
    132     interactive_display (NULL, "[Internal File Editor]"); 
     132    interactive_display ("[Internal File Editor]"); 
    133133    edit->force |= REDRAW_COMPLETELY; 
    134134} 
    135135 

  • src/help.c 

    diff --git a/src/help.c b/src/help.c
index ed0a479..54885fb 100644
    a b mousedispatch_new (int y, int x, int yl, int xl) 
    885885} 
    886886 
    887887void 
    888 interactive_display (const char *filename, const char *node) 
     888interactive_display (const char *node) 
    889889{ 
    890890    const int help_colors[DLG_COLOR_NUM] = 
    891891    { 
    … … interactive_display (const char *filename, const char *node) 
    900900    char *hlpfile = NULL; 
    901901    char *filedata; 
    902902 
    903     if (filename != NULL) 
    904         filedata = load_file (filename); 
    905     else 
    906         filedata = load_mc_home_file (mc_home, mc_home_alt, "mc.hlp", &hlpfile); 
     903    filedata = load_mc_home_file (mc_home, mc_home_alt, "mc.hlp", &hlpfile); 
    907904 
    908905    if (filedata == NULL) 
    909         message (D_ERROR, MSG_ERROR, _(" Cannot open file %s \n %s "), filename ? filename : hlpfile, 
     906        message (D_ERROR, MSG_ERROR, _(" Cannot open file %s \n %s "), hlpfile, 
    910907                 unix_error_string (errno)); 
    911908 
    912909    g_free (hlpfile); 

  • src/help.h 

    diff --git a/src/help.h b/src/help.h
index 638bc5d..167e28a 100644
    a b  
    4343#define CHAR_FONT_NORMAL        '\013'  /* Ctrl-K */ 
    4444#define CHAR_FONT_ITALIC        '\024'  /* Ctrl-T */ 
    4545 
    46 void interactive_display (const char *filename, const char *node); 
     46void interactive_display (const char *node); 
    4747 
    4848#endif 

  • src/menu.c 

    diff --git a/src/menu.c b/src/menu.c
index 6a074b5..6758ddc 100644
    a b menubar_handle_key (WMenuBar *menubar, int key) 
    420420    switch (key) { 
    421421    case KEY_F(1): 
    422422        if (menubar->is_dropped) 
    423             interactive_display (NULL, 
    424                     ((Menu *) g_list_nth_data (menubar->menu, 
     423            interactive_display (((Menu *) g_list_nth_data (menubar->menu, 
    425424                                        menubar->selected))->help_node); 
    426425        else 
    427             interactive_display (NULL, "[Menu Bar]"); 
     426            interactive_display ("[Menu Bar]"); 
    428427        menubar_draw (menubar); 
    429428        return 1; 
    430429 

  • src/tree.c 

    diff --git a/src/tree.c b/src/tree.c
index 109eeb1..074be67 100644
    a b tree_execute_cmd (WTree *tree, unsigned long command) 
    883883 
    884884    switch (command) { 
    885885    case CK_TreeHelp: 
    886         interactive_display (NULL, "[Directory Tree]"); 
     886        interactive_display ("[Directory Tree]"); 
    887887        break; 
    888888    case CK_TreeForget: 
    889889        tree_forget (tree); 

  • src/viewer/actions_cmd.c 

    diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c
index 016c0ef..ed804f9 100644
    a b mcview_execute_cmd (mcview_t * view, unsigned long command) 
    324324    switch (command) 
    325325    { 
    326326    case CK_ViewHelp: 
    327         interactive_display (NULL, "[Internal File Viewer]"); 
     327        interactive_display ("[Internal File Viewer]"); 
    328328        break; 
    329329    case CK_ViewToggleWrapMode: 
    330330        /* Toggle between wrapped and unwrapped view */