From nobody Wed Oct 23 00:24:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1728982433; cv=none; d=zohomail.com; s=zohoarc; b=OjldEAfDeF4Qv4PW9rrQt81i659I5qzQM80OHXI4RIeZ22vKOd1kRyt8SuiWlWa8aQrwMaA9Cmn2SkcU1lvpVwbmTY3YHIkwYa52nvx+jCt84z9Ad5/24B+c6ZzpLxkTLcrRbzoM6+vkJNVVCAXJVLtumCb15B3KaLp9bvv+BNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728982433; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=k/XRfwmcrhHo6bRBMo1Ajn6i9VizFBtid5loVU0rVxc=; b=JTQC9oQCj6eVexIv/b9MQ2Sv2whBGBvRhUwJVhTc2HesJd4eQiPzv8hl+QHrns+tW6n3VRtOcGXA0o+8ZHlI/T2uDfhcPHqCFWmqbs9qwQt2yI1egeUhCNRXFIatOLDF257aIJTBr6kRpoX8e0FLV3CQgeDh1rgOpHzUvPBhVcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1728982433115846.070847378801; Tue, 15 Oct 2024 01:53:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0dI3-00073w-18; Tue, 15 Oct 2024 04:52:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0dHz-00072P-5x for qemu-devel@nongnu.org; Tue, 15 Oct 2024 04:52:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0dHw-00089j-3q for qemu-devel@nongnu.org; Tue, 15 Oct 2024 04:52:22 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-YUu35J8KMC-KySGf--fTRQ-1; Tue, 15 Oct 2024 04:52:10 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 816C71955EEA; Tue, 15 Oct 2024 08:52:09 +0000 (UTC) Received: from localhost (unknown [10.39.208.15]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 59EC91956089; Tue, 15 Oct 2024 08:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728982338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k/XRfwmcrhHo6bRBMo1Ajn6i9VizFBtid5loVU0rVxc=; b=ITfcSKH33c+pLPLvHsLhlbTZKiclx6KPvIVc3XWM/d/T4PK7T3L7evqv37SWorBDJT6JQk pAM117jmJTXTIjWBrRSez1ikPZC322g1t9Qo9OARNFlPBVNkvSIv7bgOarLuWV5gj1a+6X Zke+oANJiEoIhiGsbi/xkyJw7fmLtuE= X-MC-Unique: YUu35J8KMC-KySGf--fTRQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Roman Penyaev , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PULL 3/8] chardev/mux: use bool type for `linestart` and `term_got_escape` Date: Tue, 15 Oct 2024 12:51:45 +0400 Message-ID: <20241015085150.219486-4-marcandre.lureau@redhat.com> In-Reply-To: <20241015085150.219486-1-marcandre.lureau@redhat.com> References: <20241015085150.219486-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.076, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1728982435033116600 From: Roman Penyaev Those are boolean variables, not signed integers. Signed-off-by: Roman Penyaev Cc: "Marc-Andr=C3=A9 Lureau" Cc: qemu-devel@nongnu.org Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20241014152408.427700-4-r.peniaev@gmail.com> --- chardev/chardev-internal.h | 4 ++-- chardev/char-mux.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h index c3024b51fd..975c16de80 100644 --- a/chardev/chardev-internal.h +++ b/chardev/chardev-internal.h @@ -39,7 +39,7 @@ struct MuxChardev { CharBackend chr; int focus; int mux_cnt; - int term_got_escape; + bool term_got_escape; /* Intermediate input buffer catches escape sequences even if the currently active device is not accepting any input - but only until= it is full as well. */ @@ -49,7 +49,7 @@ struct MuxChardev { int timestamps; =20 /* Protected by the Chardev chr_write_lock. */ - int linestart; + bool linestart; int64_t timestamps_start; }; typedef struct MuxChardev MuxChardev; diff --git a/chardev/char-mux.c b/chardev/char-mux.c index ee2d47b20d..728596c6f3 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -73,11 +73,11 @@ static int mux_chr_write(Chardev *chr, const uint8_t *b= uf, int len) * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&d->chr, (uint8_t *)buf1, strlen(buf1)); - d->linestart =3D 0; + d->linestart =3D false; } ret +=3D qemu_chr_fe_write(&d->chr, buf + i, 1); if (buf[i] =3D=3D '\n') { - d->linestart =3D 1; + d->linestart =3D true; } } } @@ -145,7 +145,7 @@ static void mux_chr_be_event(Chardev *chr, QEMUChrEvent= event) static int mux_proc_byte(Chardev *chr, MuxChardev *d, int ch) { if (d->term_got_escape) { - d->term_got_escape =3D 0; + d->term_got_escape =3D false; if (ch =3D=3D term_escape_char) { goto send_char; } @@ -175,11 +175,11 @@ static int mux_proc_byte(Chardev *chr, MuxChardev *d,= int ch) case 't': d->timestamps =3D !d->timestamps; d->timestamps_start =3D -1; - d->linestart =3D 0; + d->linestart =3D false; break; } } else if (ch =3D=3D term_escape_char) { - d->term_got_escape =3D 1; + d->term_got_escape =3D true; } else { send_char: return 1; --=20 2.47.0