From patchwork Sat Nov 1 21:45:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 3540 Received: (qmail 24392 invoked by alias); 1 Nov 2014 21:46:04 -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 24298 invoked by uid 89); 1 Nov 2014 21:46:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.3 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; Sat, 01 Nov 2014 21:46:02 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sA1Lk14G019144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Sat, 1 Nov 2014 17:46:01 -0400 Received: from host1.jankratochvil.net (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sA1Ljxv6019136 for ; Sat, 1 Nov 2014 17:46:00 -0400 Subject: [PATCH v3 01/14] introduce ui_file_write_for_put From: Jan Kratochvil To: gdb-patches@sourceware.org Date: Sat, 01 Nov 2014 22:45:59 +0100 Message-ID: <20141101214559.13230.53279.stgit@host1.jankratochvil.net> In-Reply-To: <20141101214552.13230.45564.stgit@host1.jankratochvil.net> References: <20141101214552.13230.45564.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes From: Tom Tromey This introduces a small helper function, ui_file_write_for_put. It is a wrapper for ui_write that is suitable for passing directly to ui_file_put. This patch also updates one existing spot to use this new function. 2014-10-07 Tom Tromey * ui-file.h (ui_file_write_for_put): Declare. * ui-file.c (ui_file_write_for_put): New function. * mi/mi-out.c (do_write): Remove. (mi_out_put): Use ui_file_write_for_put. --- gdb/ChangeLog | 7 +++++++ gdb/mi/mi-out.c | 8 +------- gdb/ui-file.c | 6 ++++++ gdb/ui-file.h | 6 ++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a629660..9993a2b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-10-07 Tom Tromey + + * ui-file.h (ui_file_write_for_put): Declare. + * ui-file.c (ui_file_write_for_put): New function. + * mi/mi-out.c (do_write): Remove. + (mi_out_put): Use ui_file_write_for_put. + 2014-10-31 Doug Evans * objfiles.h (ALL_PSPACE_OBJFILES_SAFE): Delete, unused. diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index 6ec41e6..9f5d1c0 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -376,18 +376,12 @@ mi_out_rewind (struct ui_out *uiout) /* Dump the buffer onto the specified stream. */ -static void -do_write (void *data, const char *buffer, long length_buffer) -{ - ui_file_write (data, buffer, length_buffer); -} - void mi_out_put (struct ui_out *uiout, struct ui_file *stream) { mi_out_data *data = ui_out_data (uiout); - ui_file_put (data->buffer, do_write, stream); + ui_file_put (data->buffer, ui_file_write_for_put, stream); ui_file_rewind (data->buffer); } diff --git a/gdb/ui-file.c b/gdb/ui-file.c index 49607dc..e3c7ba2 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -223,6 +223,12 @@ ui_file_write (struct ui_file *file, } void +ui_file_write_for_put (void *data, const char *buffer, long length_buffer) +{ + ui_file_write (data, buffer, length_buffer); +} + +void ui_file_write_async_safe (struct ui_file *file, const char *buf, long length_buf) diff --git a/gdb/ui-file.h b/gdb/ui-file.h index 50c1333..29ce5e0 100644 --- a/gdb/ui-file.h +++ b/gdb/ui-file.h @@ -98,6 +98,12 @@ extern int ui_file_isatty (struct ui_file *); extern void ui_file_write (struct ui_file *file, const char *buf, long length_buf); +/* A wrapper for ui_file_write that is suitable for use by + ui_file_put. */ + +extern void ui_file_write_for_put (void *data, const char *buffer, + long length_buffer); + extern void ui_file_write_async_safe (struct ui_file *file, const char *buf, long length_buf);