From 6e6ec057cb49a978505d93fd9a5246dc8415023d Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Wed, 1 Dec 2010 15:16:54 +0300
Subject: [PATCH] Avoid compiler warnings.

(file_mask_dialog): do_background argument shadows do_background()
function; renamed to do_bg.

(label_callback): unitialized variable.

(read_filesystem_list): const char *.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
---
 lib/widget/label.c          | 3 ++-
 src/filemanager/filegui.c   | 6 +++---
 src/filemanager/filegui.h   | 2 +-
 src/filemanager/mountlist.c | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/widget/label.c b/lib/widget/label.c
index c4cabb5ca..1e05f51b6 100644
--- a/lib/widget/label.c
+++ b/lib/widget/label.c
@@ -85,7 +85,7 @@ label_callback (Widget * w, widget_msg_t msg, int parm)
             while (TRUE)
             {
                 char *q;
-                char c;
+                char c = '\0';
 
                 q = strchr (p, '\n');
                 if (q != NULL)
@@ -99,6 +99,7 @@ label_callback (Widget * w, widget_msg_t msg, int parm)
 
                 if (q == NULL)
                     break;
+
                 q[0] = c;
                 p = q + 1;
                 y++;
diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c
index e111e2723..122f2eb3c 100644
--- a/src/filemanager/filegui.c
+++ b/src/filemanager/filegui.c
@@ -912,7 +912,7 @@ char *
 file_mask_dialog (FileOpContext * ctx, FileOperation operation,
                   gboolean only_one,
                   const char *format, const void *text,
-                  const char *def_text, gboolean * do_background)
+                  const char *def_text, gboolean * do_bg)
 {
     const size_t FMDY = 13;
     const size_t FMDX = 68;
@@ -1049,7 +1049,7 @@ file_mask_dialog (FileOpContext * ctx, FileOperation operation,
     fmd_widgets[7 - OFFSET].u.input.text = def_text_secure;
 
     ctx->stable_symlinks = FALSE;
-    *do_background = FALSE;
+    *do_bg = FALSE;
 
     {
         struct stat buf;
@@ -1143,7 +1143,7 @@ file_mask_dialog (FileOpContext * ctx, FileOperation operation,
             dest_dir = g_strdup ("./");
         }
         if (val == B_USER)
-            *do_background = TRUE;
+            *do_bg = TRUE;
     }
 
     return dest_dir;
diff --git a/src/filemanager/filegui.h b/src/filemanager/filegui.h
index 17350362a..919ff2d71 100644
--- a/src/filemanager/filegui.h
+++ b/src/filemanager/filegui.h
@@ -27,7 +27,7 @@ void file_op_context_destroy_ui (FileOpContext * ctx);
 char *file_mask_dialog (FileOpContext * ctx, FileOperation operation,
                         gboolean only_one,
                         const char *format, const void *text,
-                        const char *def_text, gboolean * do_background);
+                        const char *def_text, gboolean * do_bg);
 
 FileProgressStatus check_progress_buttons (FileOpContext * ctx);
 
diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c
index 29d6f50b3..bdc56482a 100644
--- a/src/filemanager/mountlist.c
+++ b/src/filemanager/mountlist.c
@@ -549,7 +549,7 @@ read_filesystem_list (int need_fs_type, int all_fs)
 #ifdef MOUNTED_GETMNTENT2       /* SVR4.  */
     {
         struct mnttab mnt;
-        char *table = MNTTAB;
+        const char *table = MNTTAB;
         FILE *fp;
         int ret;
 
-- 
2.11.4.GIT