Ticket #3598: mc-3598-0030-filemanager-layout.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0030-filemanager-layout.c-cleanup-Wcast-qual-warning.patch, 1.3 KB (added by and, 8 years ago)

  • src/filemanager/layout.c 

    From f7ff2c6d254e75f0817f3b85adfef46d53fbfdfe Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 16:08:02 +0000
Subject: [PATCH] filemanager/layout.c: cleanup -Wcast-qual warning

layout.c: In function 'setup_cmdline':
layout.c:810:24: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     char *tmp_prompt = (char *) mc_prompt;
                        ^

Signed-off-by: Andreas Mohr <and@gmx.li>
index b97921a..171f3d2 100644
    a b setup_cmdline (void) 
    807807{ 
    808808    int prompt_width; 
    809809    int y; 
    810     char *tmp_prompt = (char *) mc_prompt; 
     810    char *tmp_prompt = NULL; 
    811811 
    812812#ifdef ENABLE_SUBSHELL 
    813813    if (mc_global.tty.use_subshell) 
    … … setup_cmdline (void) 
    816816        (void) strip_ctrl_codes (tmp_prompt); 
    817817    } 
    818818#endif 
     819    if (tmp_prompt == NULL) 
     820        tmp_prompt = g_strdup (mc_prompt); 
    819821 
    820822    prompt_width = str_term_width1 (tmp_prompt); 
    821823 
    … … setup_cmdline (void) 
    833835    if (mc_global.tty.use_subshell) 
    834836    { 
    835837        subshell_prompt = g_string_new (tmp_prompt); 
    836         g_free (tmp_prompt); 
    837838        mc_prompt = subshell_prompt->str; 
    838839    } 
    839840#endif 
     841    g_free (tmp_prompt); 
    840842 
    841843    y = LINES - 1 - mc_global.keybar_visible; 
    842844