From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14310 invoked by alias); 26 Oct 2015 03:47:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 14169 invoked by uid 89); 26 Oct 2015 03:47:07 -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:04 +0000 Received: from simark.lan. (cable-192.222.137.139.electronicbox.net [192.222.137.139]) by smtp.electronicbox.net (Postfix) with ESMTP id 7D1EF440E80; Sun, 25 Oct 2015 23:47:02 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH c++ 05/12] guile: Constify gdbscm_with_guile return value Date: Mon, 26 Oct 2015 05:29:00 -0000 Message-Id: <1445831204-16588-5-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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2015-10/txt/msg00535.txt.bz2 Initially fixess: /home/simark/src/binutils-gdb/gdb/guile/scm-disasm.c: In function ‘void* gdbscm_disasm_read_memory_worker(void*)’: /home/simark/src/binutils-gdb/gdb/guile/scm-disasm.c:93:12: error: invalid conversion from ‘const void*’ to ‘void*’ [-fpermissive] return "seek error"; This makes const the whole path that leads to the return of gdbscm_with_guile. gdb/ChangeLog: * guile/guile-internal.h (gdbscm_with_guile): Constify function pointer return value and self return value. * guile/scm-safe-call.c (gdbscm_with_guile): Likewise. (struct c_data) : Constify return value. (struct c_data) : Constify. (scscm_eval_scheme_string): Constify return value. (gdbscm_safe_eval_string): Constify status variable. (scscm_source_scheme_script): Constify return value. (gdbscm_safe_source_script): Constify status variable. * guile/scm-disasm.c (gdbscm_disasm_read_memory_worker): Constify returrn value. (gdbscm_disasm_read_memory): Constify status variable. i --- gdb/guile/guile-internal.h | 2 +- gdb/guile/scm-disasm.c | 4 ++-- gdb/guile/scm-safe-call.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h index 017309a..0af01d2 100644 --- a/gdb/guile/guile-internal.h +++ b/gdb/guile/guile-internal.h @@ -384,7 +384,7 @@ extern void gdbscm_memory_error (const char *subr, const char *msg, SCM args) /* scm-safe-call.c */ -extern void *gdbscm_with_guile (void *(*func) (void *), void *data); +extern const void *gdbscm_with_guile (const void *(*func) (void *), void *data); extern SCM gdbscm_call_guile (SCM (*func) (void *), void *data, excp_matcher_func *ok_excps); diff --git a/gdb/guile/scm-disasm.c b/gdb/guile/scm-disasm.c index d1572c7..63889c1 100644 --- a/gdb/guile/scm-disasm.c +++ b/gdb/guile/scm-disasm.c @@ -76,7 +76,7 @@ dascm_make_insn (CORE_ADDR pc, const char *assembly, int insn_len) Scheme port. Called via gdbscm_call_guile. The result is a statically allocated error message or NULL if success. */ -static void * +static const void * gdbscm_disasm_read_memory_worker (void *datap) { struct gdbscm_disasm_read_data *data @@ -109,7 +109,7 @@ gdbscm_disasm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, struct disassemble_info *dinfo) { struct gdbscm_disasm_read_data data; - void *status; + const void *status; data.memaddr = memaddr; data.myaddr = myaddr; diff --git a/gdb/guile/scm-safe-call.c b/gdb/guile/scm-safe-call.c index 62aec0f..85a2a5b 100644 --- a/gdb/guile/scm-safe-call.c +++ b/gdb/guile/scm-safe-call.c @@ -28,10 +28,10 @@ struct c_data { - void *(*func) (void *); + const void *(*func) (void *); void *data; /* An error message or NULL for success. */ - void *result; + const void *result; }; /* Struct to marshall args through gdbscm_with_catch. */ @@ -167,8 +167,8 @@ gdbscm_with_catch (void *data) The result if NULL if no exception occurred, otherwise it is a statically allocated error message (caller must *not* free). */ -void * -gdbscm_with_guile (void *(*func) (void *), void *data) +const void * +gdbscm_with_guile (const void *(*func) (void *), void *data) { struct c_data c_data; struct with_catch_data catch_data; @@ -369,7 +369,7 @@ struct eval_scheme_string_data /* Wrapper to eval a C string in the Guile interpreter. This is passed to gdbscm_with_guile. */ -static void * +static const void * scscm_eval_scheme_string (void *datap) { struct eval_scheme_string_data *data @@ -398,12 +398,12 @@ char * gdbscm_safe_eval_string (const char *string, int display_result) { struct eval_scheme_string_data data = { string, display_result }; - void *result; + const void *result; result = gdbscm_with_guile (scscm_eval_scheme_string, (void *) &data); if (result != NULL) - return xstrdup ((char *) result); + return xstrdup ((const char *) result); return NULL; } @@ -411,7 +411,7 @@ gdbscm_safe_eval_string (const char *string, int display_result) /* Helper function for gdbscm_safe_source_scheme_script. */ -static void * +static const void * scscm_source_scheme_script (void *data) { const char *filename = (const char *) data; @@ -439,7 +439,7 @@ gdbscm_safe_source_script (const char *filename) by default. This function is invoked by the "source" GDB command which already has its own path search support. */ char *abs_filename = NULL; - void *result; + const void *result; if (!IS_ABSOLUTE_PATH (filename)) { @@ -452,7 +452,7 @@ gdbscm_safe_source_script (const char *filename) xfree (abs_filename); if (result != NULL) - return xstrdup ((char *) result); + return xstrdup ((const char *) result); return NULL; } -- 2.6.2