From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 110306 invoked by alias); 24 Nov 2016 15:28:17 -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 110245 invoked by uid 89); 24 Nov 2016 15:28:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.4 required=5.0 tests=AWL,BAYES_50,SPF_SOFTFAIL autolearn=no version=3.3.2 spammy=Hx-spam-relays-external:sk:cable-1, H*RU:sk:cable-1, H*r:sk:cable-1, uiout X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 24 Nov 2016 15:28:07 +0000 X-ASG-Debug-ID: 1480001285-0c856e65d5b89e70001-fS2M51 Received: from smtp.electronicbox.net (smtp.electronicbox.net [96.127.255.82]) by barracuda.ebox.ca with ESMTP id vkMQTbHbIpc7uccm (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Nov 2016 10:28:05 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.lan (cable-11.246.173-162.electronicbox.net [173.246.11.162]) by smtp.electronicbox.net (Postfix) with ESMTP id B070B440E7C; Thu, 24 Nov 2016 10:28:05 -0500 (EST) From: Simon Marchi X-Barracuda-Effective-Source-IP: cable-11.246.173-162.electronicbox.net[173.246.11.162] X-Barracuda-Apparent-Source-IP: 173.246.11.162 X-Barracuda-RBL-IP: 173.246.11.162 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 12/22] Use std::string in ui_out_table Date: Thu, 24 Nov 2016 15:28:00 -0000 X-ASG-Orig-Subj: [PATCH 12/22] Use std::string in ui_out_table Message-Id: <20161124152710.25007-12-simon.marchi@polymtl.ca> In-Reply-To: <20161124152428.24725-1-simon.marchi@polymtl.ca> References: <20161124152428.24725-1-simon.marchi@polymtl.ca> X-Barracuda-Connect: smtp.electronicbox.net[96.127.255.82] X-Barracuda-Start-Time: 1480001285 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 2525 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.34709 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header X-IsSubscribed: yes X-SW-Source: 2016-11/txt/msg00753.txt.bz2 Use std::string for the id field of the ui_out_table object. I found that all users of ui_out_table_begin passed a non-NULL value to the tblid parameter, so we don't have to worry about the NULL case. I changed the tblid parameter to be a std::string while at it. gdb/ChangeLog: * ui-out.c (struct ui_out_table) : Change type to std::string. (ui_out_table_begin): Change tblid parameter type to std::string, adapt code. update following type change. (clear_table): Update. (ui_out_new): Update. --- gdb/ui-out.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gdb/ui-out.c b/gdb/ui-out.c index 1713183..a40ac0a 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -27,6 +27,7 @@ #include #include +#include /* table header structures */ @@ -72,7 +73,7 @@ struct ui_out_table /* String identifying the table (as specified in the table_begin call). */ - char *id; + std::string id; /* Points to the first table header (if any). */ struct ui_out_hdr *header_first; @@ -194,8 +195,7 @@ static void verify_field (struct ui_out *uiout, int *fldno, int *width, static void ui_out_table_begin (struct ui_out *uiout, int nbrofcols, - int nr_rows, - const char *tblid) + int nr_rows, const std::string &tblid) { if (uiout->table.flag) internal_error (__FILE__, __LINE__, @@ -206,13 +206,11 @@ previous table_end.")); uiout->table.body_flag = 0; uiout->table.entry_level = uiout->level + 1; uiout->table.columns = nbrofcols; - if (tblid != NULL) - uiout->table.id = xstrdup (tblid); - else - uiout->table.id = NULL; + uiout->table.id = tblid; + clear_header_list (uiout); - uo_table_begin (uiout, nbrofcols, nr_rows, uiout->table.id); + uo_table_begin (uiout, nbrofcols, nr_rows, uiout->table.id.c_str ()); } void @@ -577,8 +575,7 @@ uo_table_header (struct ui_out *uiout, int width, enum ui_align align, static void clear_table (struct ui_out *uiout) { - xfree (uiout->table.id); - uiout->table.id = NULL; + uiout->table.id.clear (); clear_header_list (uiout); } @@ -875,7 +872,6 @@ ui_out_new (const struct ui_out_impl *impl, void *data, current->field_count = 0; uiout->levels.push_back (std::move (current)); - uiout->table.id = NULL; uiout->table.header_first = NULL; uiout->table.header_last = NULL; uiout->table.header_next = NULL; -- 2.10.0