From nobody Sun Feb 8 17:42:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637845176; cv=none; d=zohomail.com; s=zohoarc; b=YTDNy2g5Mu+Oj+j1w5Y9BzGS2NXhwv8Z7CiBuQSQoVdoNoFhctiprCFEhIlay1640PyJrBts1QGdZ5tywMJkra2QXdrEf4dj/UxjoxWQb+6Ux//xEJMROuwx0Cy95ZXY2vJ6prGdDHLPOgtAQdx0MJa8T/3tQJ0cDZg8nrLL6PE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637845176; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FyHC4vYudY/Z38uwn8ipJca/V+AHud9XjYjCGH1gAsE=; b=fKStt43ZV59IpW1gUQAQKIKouqyy+MrxbsoOZDoMFvA5cThFZvFprPBMGlBs0HO0FZqL+Cw49iLtgGX1r2sTBDtbY2gZRBzvjsjIYmnfFnuDq42MJpSy1BORI7W7af02HemOVb9/Ytvxmvt1Til3ldRNYMQIDDzLnnYmn3joUvY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637845176851378.3089692561563; Thu, 25 Nov 2021 04:59:36 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-544-HBRnHq4FPa21kWaLUNB9fA-1; Thu, 25 Nov 2021 07:59:32 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 532472F26; Thu, 25 Nov 2021 12:59:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 363155F4F4; Thu, 25 Nov 2021 12:59:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 010404A7CA; Thu, 25 Nov 2021 12:59:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1APCxGEU030995 for ; Thu, 25 Nov 2021 07:59:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id BAE685D740; Thu, 25 Nov 2021 12:59:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 237D45F4EF for ; Thu, 25 Nov 2021 12:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637845175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FyHC4vYudY/Z38uwn8ipJca/V+AHud9XjYjCGH1gAsE=; b=LOiys51FJMP2xVtOR+ADz1u6tB1kkatGzoTvba62YXgB7fuuuGT/Y7FV52HhPzNIiO0fbV +2kM3L9lJcddUTCdg/+UqYOREm/Em48lFHZfeeYMH1kMmxEbIOmDMKZKFsjs4JrP78V+Pb 4zD47ky6nz0yrk2vW68END5sPu/QGYs= X-MC-Unique: HBRnHq4FPa21kWaLUNB9fA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/6] internal: Add STRLIM macro for checking string length using strnlen() Date: Thu, 25 Nov 2021 13:59:08 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637845177098100003 Content-Type: text/plain; charset="utf-8" As a microoprimization when checking whether length of a string fits into a limit we don't necessarily need to calculate the full lenght but can use strnlen to check only LIMIT+1 chars. Add a macro which will simplify the expressions. Signed-off-by: Peter Krempa --- src/internal.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/internal.h b/src/internal.h index d3809bf057..2e404cd705 100644 --- a/src/internal.h +++ b/src/internal.h @@ -87,6 +87,15 @@ #define STRPREFIX(a, b) (strncmp(a, b, strlen(b)) =3D=3D 0) #define STRCASEPREFIX(a, b) (g_ascii_strncasecmp(a, b, strlen(b)) =3D=3D 0) #define STRSKIP(a, b) (STRPREFIX(a, b) ? (a) + strlen(b) : NULL) +/** + * STRLIM + * @str: pointer to a string (evaluated once) + * @lim: length limit (evaluated twice) + * + * Evaluates as true if length of @str doesn't exceed the limit @lim. Note + * that @lim + 1 characters may be accessed. + */ +#define STRLIM(str, lim) (strnlen((str), (lim) + 1) <=3D (lim)) #define STREQ_NULLABLE(a, b) (g_strcmp0(a, b) =3D=3D 0) #define STRNEQ_NULLABLE(a, b) (g_strcmp0(a, b) !=3D 0) --=20 2.31.1