From patchwork Fri Jun 20 15:57:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 1599 Received: (qmail 8412 invoked by alias); 20 Jun 2014 15:58:12 -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 8314 invoked by uid 89); 20 Jun 2014 15:58:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD 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; Fri, 20 Jun 2014 15:58:07 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5KFw6hU027304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 20 Jun 2014 11:58:06 -0400 Received: from barimba.redhat.com (ovpn-113-103.phx2.redhat.com [10.3.113.103]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5KFw53F015561; Fri, 20 Jun 2014 11:58:05 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 01/14] introduce ui_file_write_for_put Date: Fri, 20 Jun 2014 09:57:41 -0600 Message-Id: <1403279874-23781-2-git-send-email-tromey@redhat.com> In-Reply-To: <1403279874-23781-1-git-send-email-tromey@redhat.com> References: <1403279874-23781-1-git-send-email-tromey@redhat.com> 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-06-20 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/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 e59d70b..e5e35d8 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -226,6 +226,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);