From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 903 invoked by alias); 28 Jun 2013 17:40:53 -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 842 invoked by uid 89); 28 Jun 2013 17:40:53 -0000 X-Spam-SWARE-Status: No, score=-7.4 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 28 Jun 2013 17:40:52 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5SHel5w021208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 28 Jun 2013 13:40:51 -0400 Received: from barimba.redhat.com (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5SHea0c010167; Fri, 28 Jun 2013 13:40:47 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 13/16] move sizeof_pkt into remote_trace_find Date: Fri, 28 Jun 2013 17:40:00 -0000 Message-Id: <1372441229-305-14-git-send-email-tromey@redhat.com> In-Reply-To: <1372441229-305-1-git-send-email-tromey@redhat.com> References: <1372441229-305-1-git-send-email-tromey@redhat.com> X-SW-Source: 2013-06/txt/msg00903.txt.bz2 The global sizeof_pkt is only used in remote_trace_find, like so: reply = remote_get_noisy_reply (&(rs->buf), &sizeof_pkt); I think in this situation it is more correct to use the recorded size of the buffer. Otherwise it seems that some skew could result. * remote.c (sizeof_pkt): Remove. (remote_trace_find): Use rs->buf_size, not sizeof_pkt. --- gdb/remote.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index d7650b1..381d596 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -493,8 +493,6 @@ struct remote_arch_state long remote_packet_size; }; -long sizeof_pkt = 2000; - /* Utility: generate error from an incoming stub packet. */ static void trace_error (char *buf) @@ -10974,7 +10972,7 @@ remote_trace_find (enum trace_find_type type, int num, } putpkt (rs->buf); - reply = remote_get_noisy_reply (&(rs->buf), &sizeof_pkt); + reply = remote_get_noisy_reply (&(rs->buf), &rs->buf_size); if (*reply == '\0') error (_("Target does not support this command.")); -- 1.8.1.4