From patchwork Mon Aug 18 08:46:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2410 Received: (qmail 16095 invoked by alias); 18 Aug 2014 08:47:11 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 15966 invoked by uid 89); 18 Aug 2014 08:47:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 18 Aug 2014 08:47:06 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7I8l2TL012126 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 18 Aug 2014 04:47:03 -0400 Received: from blade.nx (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7I8l098029493 for ; Mon, 18 Aug 2014 04:47:01 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 6A0F62640D8 for ; Mon, 18 Aug 2014 09:47:00 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 1/5] Move internal_{,v}warning to common/errors.[ch] Date: Mon, 18 Aug 2014 09:46:54 +0100 Message-Id: <1408351618-21013-2-git-send-email-gbenson@redhat.com> In-Reply-To: <1408351618-21013-1-git-send-email-gbenson@redhat.com> References: <1408351618-21013-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit moves internal_warning and internal_vwarning into common/errors.[ch]. gdb/ 2014-08-18 Gary Benson * common/errors.h (internal_warning): New declaration. (internal_vwarning): Likewise. * common/errors.c (internal_warning): New function. * utils.h (internal_warning): Don't declare. (internal_vwarning): Likewise. * utils.c (internal_warning): Removed. gdb/gdbserver/ 2014-08-18 Gary Benson * utils.c (internal_vwarning): New function. --- gdb/ChangeLog | 9 +++++++++ gdb/common/errors.c | 12 ++++++++++++ gdb/common/errors.h | 15 +++++++++++++++ gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/utils.c | 11 +++++++++++ gdb/utils.c | 10 ---------- gdb/utils.h | 7 ------- 7 files changed, 51 insertions(+), 17 deletions(-) diff --git a/gdb/common/errors.c b/gdb/common/errors.c index 6da2666..089c64b 100644 --- a/gdb/common/errors.c +++ b/gdb/common/errors.c @@ -55,3 +55,15 @@ internal_error (const char *file, int line, const char *fmt, ...) internal_verror (file, line, fmt, ap); va_end (ap); } + +/* See common/errors.h. */ + +void +internal_warning (const char *file, int line, const char *fmt, ...) +{ + va_list ap; + + va_start (ap, fmt); + internal_vwarning (file, line, fmt, ap); + va_end (ap); +} diff --git a/gdb/common/errors.h b/gdb/common/errors.h index 4e6c2b3..88d77e5 100644 --- a/gdb/common/errors.h +++ b/gdb/common/errors.h @@ -58,6 +58,21 @@ extern void internal_error (const char *file, int line, extern void internal_verror (const char *file, int line, const char *fmt, va_list args) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 0); + +/* An internal problem was detected, but the requested operation can + still proceed. Internal warnings indicate programming errors as + opposed to more general issues beyond the application's control. + A warning message is constructed using a printf- or vprintf-style + argument list. The function "internal_vwarning" must be provided + by the client. */ + +extern void internal_warning (const char *file, int line, + const char *fmt, ...) + ATTRIBUTE_PRINTF (3, 4); + +extern void internal_vwarning (const char *file, int line, + const char *fmt, va_list args) + ATTRIBUTE_PRINTF (3, 0); /* Like "error", but the error message is constructed by combining diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c index 3aac3cd..3ec4add 100644 --- a/gdb/gdbserver/utils.c +++ b/gdb/gdbserver/utils.c @@ -129,6 +129,17 @@ internal_verror (const char *file, int line, const char *fmt, va_list args) exit (1); } +/* Report a problem internal to GDBserver. */ + +void +internal_vwarning (const char *file, int line, const char *fmt, va_list args) +{ + fprintf (stderr, "\ +%s:%d: A problem internal to " TOOLNAME " has been detected.\n", file, line); + vfprintf (stderr, fmt, args); + fprintf (stderr, "\n"); +} + /* Convert a CORE_ADDR into a HEX string, like %lx. The result is stored in a circular static buffer, NUMCELLS deep. */ diff --git a/gdb/utils.c b/gdb/utils.c index 2b64023..759ec84 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -797,16 +797,6 @@ internal_vwarning (const char *file, int line, const char *fmt, va_list ap) internal_vproblem (&internal_warning_problem, file, line, fmt, ap); } -void -internal_warning (const char *file, int line, const char *string, ...) -{ - va_list ap; - - va_start (ap, string); - internal_vwarning (file, line, string, ap); - va_end (ap); -} - static struct internal_problem demangler_warning_problem = { "demangler-warning", 1, internal_problem_ask, 0, internal_problem_no }; diff --git a/gdb/utils.h b/gdb/utils.h index 57a1c0f..2ec3fda 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -283,13 +283,6 @@ extern char *warning_pre_print; extern void error_stream (struct ui_file *) ATTRIBUTE_NORETURN; -extern void internal_vwarning (const char *file, int line, - const char *, va_list ap) - ATTRIBUTE_PRINTF (3, 0); - -extern void internal_warning (const char *file, int line, - const char *, ...) ATTRIBUTE_PRINTF (3, 4); - extern void demangler_vwarning (const char *file, int line, const char *, va_list ap) ATTRIBUTE_PRINTF (3, 0);