bug-parted
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#16055: [PATCH 2/2] "-Wall -Wextra -Werror" compilation patches - par


From: Doron Tsur
Subject: bug#16055: [PATCH 2/2] "-Wall -Wextra -Werror" compilation patches - part 2/2 parted/ui.c:169:1: error: string length '827' is greater than the length '509' ISO C90 compilers are required to support [-Werror=overlength-strings]
Date: Wed, 4 Dec 2013 16:33:20 +0200

Tests: Ubuntu 13.10 compilation
.../configure --prefix=/usr --without-readline CFLAGS="-Wall -Wextra -Werror" 
&& make
Signed-off-by: Doron Tsur <address@hidden>
---
 parted/ui.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/parted/ui.c b/parted/ui.c
index be93ea9..327cc93 100644
--- a/parted/ui.c
+++ b/parted/ui.c
@@ -166,15 +166,16 @@ static const char* usage_msg = N_(
 "Apply COMMANDs with PARAMETERS to DEVICE.  If no COMMAND(s) are given, "
 "run in\ninteractive mode.\n");
 
-static const char* bug_msg = N_(
+static const char* bug_msg_extension = N_(
 "\n\nYou found a bug in GNU Parted! Here's what you have to do:\n\n"
 "Don't panic! The bug has most likely not affected any of your data.\n"
 "Help us to fix this bug by doing the following:\n\n"
 "Check whether the bug has already been fixed by checking\n"
 "the last version of GNU Parted that you can find at:\n\n"
 "\thttp://ftp.gnu.org/gnu/parted/\n\n";
-"Please check this version prior to bug reporting.\n\n"
-"If this has not been fixed yet or if you don't know how to check,\n"
+"Please check this version prior to bug reporting.\n\n");
+
+static const char* bug_msg = N_("%sIf this has not been fixed yet or if you 
don't know how to check,\n"
 "please visit the GNU Parted website:\n\n"
 "\thttp://www.gnu.org/software/parted\n\n";
 "for further information.\n\n"
@@ -340,7 +341,7 @@ sa_sigint_handler (int signum __attribute__((unused)), 
siginfo_t* info, void *uc
 static void
 sa_sigsegv_handler (int signum __attribute__((unused)), siginfo_t* info, void* 
ucontext __attribute__((unused)))
 {
-        fprintf (stderr, bug_msg, VERSION);
+        fprintf (stderr, bug_msg, bug_msg_extension, VERSION);
         _dump_history ();
 
         if (!info)
@@ -375,7 +376,7 @@ sa_sigsegv_handler (int signum __attribute__((unused)), 
siginfo_t* info, void* u
 static void
 sa_sigfpe_handler (int signum __attribute__((unused)), siginfo_t* info, void* 
ucontext __attribute__((unused)))
 {
-        fprintf (stderr, bug_msg, VERSION);
+        fprintf (stderr, bug_msg, bug_msg_extension, VERSION);
         _dump_history ();
 
         if (!info)
@@ -439,7 +440,7 @@ sa_sigfpe_handler (int signum __attribute__((unused)), 
siginfo_t* info, void* uc
 static void
 sa_sigill_handler (int signum __attribute__((unused)), siginfo_t* info, void* 
ucontext __attribute__((unused)))
 {
-        fprintf (stderr, bug_msg, VERSION);
+        fprintf (stderr, bug_msg, bug_msg_extension, VERSION);
         _dump_history ();
 
         if (!info)
@@ -617,7 +618,7 @@ _print_exception_text (PedException* ex)
         wipe_line ();
 
         if (ex->type == PED_EXCEPTION_BUG) {
-                fprintf (stderr, bug_msg, VERSION);
+                fprintf (stderr, bug_msg, bug_msg_extension, VERSION);
                 text = str_list_create ("\n", ex->message, "\n\n", NULL);
         } else {
                 text = str_list_create (
-- 
1.7.8.2






reply via email to

[Prev in Thread] Current Thread [Next in Thread]