From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 65878 invoked by alias); 21 Apr 2016 23:50:46 -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 65770 invoked by uid 89); 21 Apr 2016 23:50:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=paramter 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; Thu, 21 Apr 2016 23:50:43 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3897D8AE73 for ; Thu, 21 Apr 2016 23:50:42 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3LNoelu001710 for ; Thu, 21 Apr 2016 19:50:41 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 1/3] Rename rl_callback_read_char_wrapper -> gdb_rl_callback_read_char Date: Thu, 21 Apr 2016 23:50:00 -0000 Message-Id: <1461282640-30425-2-git-send-email-palves@redhat.com> In-Reply-To: <1461282640-30425-1-git-send-email-palves@redhat.com> References: <1461282640-30425-1-git-send-email-palves@redhat.com> X-SW-Source: 2016-04/txt/msg00505.txt.bz2 Use the "gdb_rl_" prefix like other gdb readline function wrappers to make it clear this is a gdb function, not a readline function. gdb/ChangeLog: 2016-04-21 Pedro Alves * event-top.c (rl_callback_read_char_wrapper): Rename to ... (gdb_rl_callback_read_char_wrapper): ... this. (change_line_handler, gdb_setup_readline): Adjust. --- gdb/event-top.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gdb/event-top.c b/gdb/event-top.c index ee8684b..b9947c4 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -48,7 +48,6 @@ /* readline defines this. */ #undef savestring -static void rl_callback_read_char_wrapper (gdb_client_data client_data); static void command_line_handler (char *rl); static void change_line_handler (void); static char *top_level_prompt (void); @@ -141,7 +140,7 @@ static struct async_signal_handler *sigtstp_token; #endif static struct async_signal_handler *async_sigterm_token; -/* This hook is called by rl_callback_read_char_wrapper after each +/* This hook is called by gdb_rl_callback_read_char_wrapper after each character is processed. */ void (*after_char_processing_hook) (void); @@ -150,7 +149,7 @@ void (*after_char_processing_hook) (void); loop expects the callback function to have a paramter, while readline expects none. */ static void -rl_callback_read_char_wrapper (gdb_client_data client_data) +gdb_rl_callback_read_char_wrapper (gdb_client_data client_data) { rl_callback_read_char (); if (after_char_processing_hook) @@ -188,7 +187,7 @@ change_line_handler (void) if (async_command_editing_p) { /* Turn on editing by using readline. */ - call_readline = rl_callback_read_char_wrapper; + call_readline = gdb_rl_callback_read_char_wrapper; input_handler = command_line_handler; } else @@ -1109,8 +1108,10 @@ set_async_editing_command (char *args, int from_tty, } /* Set things up for readline to be invoked via the alternate - interface, i.e. via a callback function (rl_callback_read_char), - and hook up instream to the event loop. */ + interface, i.e. via a callback function + (gdb_rl_callback_read_char), and hook up instream to the event + loop. */ + void gdb_setup_readline (void) { @@ -1136,7 +1137,7 @@ gdb_setup_readline (void) /* When a character is detected on instream by select or poll, readline will be invoked via this callback function. */ - call_readline = rl_callback_read_char_wrapper; + call_readline = gdb_rl_callback_read_char_wrapper; } else { -- 2.5.5