From patchwork Mon Oct 26 03:46:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 9365 Received: (qmail 13886 invoked by alias); 26 Oct 2015 03:47:05 -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 13816 invoked by uid 89); 26 Oct 2015 03:47:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, BAYES_00, SPF_SOFTFAIL autolearn=no version=3.3.2 X-HELO: smtp.electronicbox.net Received: from smtp.electronicbox.net (HELO smtp.electronicbox.net) (96.127.255.83) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 26 Oct 2015 03:47:01 +0000 Received: from simark.lan. (cable-192.222.137.139.electronicbox.net [192.222.137.139]) by smtp.electronicbox.net (Postfix) with ESMTP id 78081440E7F; Sun, 25 Oct 2015 23:46:59 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH c++ 04/12] Add scm_t_dynwind_flags casts Date: Sun, 25 Oct 2015 23:46:36 -0400 Message-Id: <1445831204-16588-4-git-send-email-simon.marchi@polymtl.ca> In-Reply-To: <1445831204-16588-1-git-send-email-simon.marchi@polymtl.ca> References: <1445831204-16588-1-git-send-email-simon.marchi@polymtl.ca> There is a handful of calls to scm_dynwind_begin (0); where the parameter is an enum, scm_t_dynwind_flags. In C++, we have no choice but to add an explicit cast, since there is no enum value that represents 0 (no flags set). gdb/ChangeLog: * guile/scm-breakpoint.c (gdbscm_set_breakpoint_stop_x): Add scm_t_dynwind_flags casts. * guile/scm-cmd.c (gdbscm_parse_command_name): Likewise. * guile/scm-ports.c (gdbscm_open_memory): Likewise. * guile/scm-value.c (gdbscm_value_to_string): Likewise. --- gdb/guile/scm-breakpoint.c | 2 +- gdb/guile/scm-cmd.c | 4 ++-- gdb/guile/scm-ports.c | 2 +- gdb/guile/scm-value.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c index 83574a3..b599e23 100644 --- a/gdb/guile/scm-breakpoint.c +++ b/gdb/guile/scm-breakpoint.c @@ -956,7 +956,7 @@ gdbscm_set_breakpoint_stop_x (SCM self, SCM newvalue) " this breakpoint."), ext_lang_capitalized_name (extlang)); - scm_dynwind_begin (0); + scm_dynwind_begin ((scm_t_dynwind_flags) 0); gdbscm_dynwind_xfree (error_text); gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG1, self, error_text); /* The following line, while unnecessary, is present for completeness diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c index 900d7b0..051f0d2 100644 --- a/gdb/guile/scm-cmd.c +++ b/gdb/guile/scm-cmd.c @@ -530,7 +530,7 @@ gdbscm_parse_command_name (const char *name, msg = xstrprintf (_("could not find command prefix '%s'"), prefix_text); xfree (prefix_text); xfree (result); - scm_dynwind_begin (0); + scm_dynwind_begin ((scm_t_dynwind_flags) 0); gdbscm_dynwind_xfree (msg); gdbscm_out_of_range_error (func_name, arg_pos, gdbscm_scm_from_c_string (name), msg); @@ -546,7 +546,7 @@ gdbscm_parse_command_name (const char *name, msg = xstrprintf (_("'%s' is not a prefix command"), prefix_text); xfree (prefix_text); xfree (result); - scm_dynwind_begin (0); + scm_dynwind_begin ((scm_t_dynwind_flags) 0); gdbscm_dynwind_xfree (msg); gdbscm_out_of_range_error (func_name, arg_pos, gdbscm_scm_from_c_string (name), msg); diff --git a/gdb/guile/scm-ports.c b/gdb/guile/scm-ports.c index 90bdb39..925f3b2 100644 --- a/gdb/guile/scm-ports.c +++ b/gdb/guile/scm-ports.c @@ -1136,7 +1136,7 @@ gdbscm_open_memory (SCM rest) &start_arg_pos, &start, &size_arg_pos, &size); - scm_dynwind_begin (0); + scm_dynwind_begin ((scm_t_dynwind_flags) 0); if (mode == NULL) mode = xstrdup ("r"); diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c index f25f7d5..851d8a7 100644 --- a/gdb/guile/scm-value.c +++ b/gdb/guile/scm-value.c @@ -1158,7 +1158,7 @@ gdbscm_value_to_string (SCM self, SCM rest) Make sure we don't leak. This is done via scm_dynwind_begin, et.al. */ discard_cleanups (cleanups); - scm_dynwind_begin (0); + scm_dynwind_begin ((scm_t_dynwind_flags) 0); gdbscm_dynwind_xfree (encoding); gdbscm_dynwind_xfree (buffer);