From c6486df5f1400d90a13df5c6dbd96aeaccf8225b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 27 Oct 2015 09:34:30 -0400 Subject: [PATCH] Add scm_t_dynwind_flags casts 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/ChangeLog | 8 ++++++++ gdb/guile/scm-breakpoint.c | 2 +- gdb/guile/scm-cmd.c | 4 ++-- gdb/guile/scm-ports.c | 2 +- gdb/guile/scm-value.c | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 768de09244b..abb4fab6f5c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2015-10-27 Simon Marchi + + * 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. + 2015-10-27 Simon Marchi * ax.h (ax_raw_byte): New declaration. diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c index 83574a3998a..b599e238add 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 900d7b0442a..051f0d2ca86 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 ffaa3fd6032..26d43bff7ea 100644 --- a/gdb/guile/scm-ports.c +++ b/gdb/guile/scm-ports.c @@ -1139,7 +1139,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 f25f7d5d487..851d8a779ef 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); -- 2.30.2