From patchwork Wed Jul 16 14:17:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2083 Received: (qmail 4373 invoked by alias); 16 Jul 2014 16:45:17 -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 4302 invoked by uid 89); 16 Jul 2014 16:45:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_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; Wed, 16 Jul 2014 16:45:12 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJZa3019955 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Jul 2014 12:19:35 -0400 Received: from blade.nx (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJX6t004850; Wed, 16 Jul 2014 12:19:34 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 8E2D52640C7; Wed, 16 Jul 2014 15:17:30 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Tom Tromey , Doug Evans Subject: [PATCH 01/15 v2] Introduce common/errors.h Date: Wed, 16 Jul 2014 15:17:09 +0100 Message-Id: <1405520243-17282-2-git-send-email-gbenson@redhat.com> In-Reply-To: <1405520243-17282-1-git-send-email-gbenson@redhat.com> References: <1405520243-17282-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This introduces common/errors.h. This holds some error- and warning-related declarations that can be used by the code in common. Clients of the "common" code must provide definitions for these functions. gdb/ 2014-07-16 Tom Tromey Gary Benson * common/errors.h: New file. * utils.h: Include errors.h. (perror_with_name, error, fatal, warning): Don't declare. * common/common-utils.h: Include errors.h. (malloc_failure, internal_error): Don't declare. gdb/gdbserver/ 2014-07-16 Tom Tromey * utils.h: Include errors.h. (perror_with_name, error, fatal, warning): Don't declare. --- gdb/ChangeLog | 9 +++++++ gdb/common/common-utils.h | 5 +--- gdb/common/errors.h | 55 +++++++++++++++++++++++++++++++++++++++++++++ gdb/gdbserver/ChangeLog | 5 ++++ gdb/gdbserver/utils.h | 5 +--- gdb/utils.h | 10 +------- 6 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 gdb/common/errors.h diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h index 063698d..53be2f8 100644 --- a/gdb/common/common-utils.h +++ b/gdb/common/common-utils.h @@ -24,6 +24,7 @@ #include "ansidecl.h" #include #include +#include "errors.h" /* If possible, define FUNCTION_NAME, a macro containing the name of the function being defined. Since this macro may not always be @@ -43,10 +44,6 @@ #endif #endif -extern void malloc_failure (long size) ATTRIBUTE_NORETURN; -extern void internal_error (const char *file, int line, const char *, ...) - ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 4); - /* xmalloc(), xrealloc() and xcalloc() have already been declared in "libiberty.h". */ diff --git a/gdb/common/errors.h b/gdb/common/errors.h new file mode 100644 index 0000000..5f998e3 --- /dev/null +++ b/gdb/common/errors.h @@ -0,0 +1,55 @@ +/* Declarations for error-reporting facilities. + + Copyright (C) 1986-2014 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef COMMON_ERRORS_H +#define COMMON_ERRORS_H + +/* The declarations in this file are, for the time being, separately + implemented by gdb and gdbserver. However they share a common + definition so that they can be used by code in common/. */ + +/* Like "perror" but throws an exception with the appropriate + text. */ + +extern void perror_with_name (const char *) ATTRIBUTE_NORETURN; + +/* Throw an exception. */ + +extern void error (const char *fmt, ...) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); + +/* Cause a fatal error. */ + +extern void fatal (const char *fmt, ...) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); + +/* Issue a warning. */ + +extern void warning (const char *, ...) ATTRIBUTE_PRINTF (1, 2); + +/* Internal error. */ + +extern void internal_error (const char *file, int line, const char *, ...) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 4); + +/* Memory allocation failure. */ + +extern void malloc_failure (long size) ATTRIBUTE_NORETURN; + +#endif /* COMMON_ERRORS_H */ diff --git a/gdb/gdbserver/utils.h b/gdb/gdbserver/utils.h index 906924b..819fa35 100644 --- a/gdb/gdbserver/utils.h +++ b/gdb/gdbserver/utils.h @@ -20,11 +20,8 @@ #define UTILS_H #include "print-utils.h" +#include "errors.h" -void perror_with_name (const char *string) ATTRIBUTE_NORETURN; -void error (const char *string,...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); -void fatal (const char *string,...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); -void warning (const char *string,...) ATTRIBUTE_PRINTF (1, 2); char *paddress (CORE_ADDR addr); char *pfildes (gdb_fildes_t fd); diff --git a/gdb/utils.h b/gdb/utils.h index a91f551..d9fe7e3 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -24,6 +24,7 @@ #include "cleanups.h" #include "exceptions.h" #include "print-utils.h" +#include "errors.h" extern void initialize_utils (void); @@ -269,7 +270,6 @@ extern void fprintf_symbol_filtered (struct ui_file *, const char *, extern void throw_perror_with_name (enum errors errcode, const char *string) ATTRIBUTE_NORETURN; -extern void perror_with_name (const char *) ATTRIBUTE_NORETURN; extern void perror_warning_with_name (const char *string); @@ -286,17 +286,11 @@ extern char *warning_pre_print; extern void verror (const char *fmt, va_list ap) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 0); -extern void error (const char *fmt, ...) - ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); - extern void error_stream (struct ui_file *) ATTRIBUTE_NORETURN; extern void vfatal (const char *fmt, va_list ap) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 0); -extern void fatal (const char *fmt, ...) - ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); - extern void internal_verror (const char *file, int line, const char *, va_list ap) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 0); @@ -308,8 +302,6 @@ extern void internal_vwarning (const char *file, int line, extern void internal_warning (const char *file, int line, const char *, ...) ATTRIBUTE_PRINTF (3, 4); -extern void warning (const char *, ...) ATTRIBUTE_PRINTF (1, 2); - extern void vwarning (const char *, va_list args) ATTRIBUTE_PRINTF (1, 0); extern void demangler_vwarning (const char *file, int line,