From owner-svn-src-projects@freebsd.org Tue May 21 15:59:18 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4BC215B12C0 for ; Tue, 21 May 2019 15:59:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7BCCF6C0E3; Tue, 21 May 2019 15:59:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ABDF7EA1; Tue, 21 May 2019 15:59:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4LFxIPo069191; Tue, 21 May 2019 15:59:18 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4LFxIHT069190; Tue, 21 May 2019 15:59:18 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201905211559.x4LFxIHT069190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 21 May 2019 15:59:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r348054 - projects/fuse2/lib/libc/gen X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/lib/libc/gen X-SVN-Commit-Revision: 348054 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7BCCF6C0E3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 May 2019 15:59:19 -0000 Author: asomers Date: Tue May 21 15:59:17 2019 New Revision: 348054 URL: https://svnweb.freebsd.org/changeset/base/348054 Log: getvfsbyname: prefer sizeof to strlen even for constants Clang is smart enough to evaluate strlen() of a constant at compile-time. However, that won't work in the future if we compile libc with -ffreestanding. Reported by: kib Dissenting: ngie, cem Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/lib/libc/gen/getvfsbyname.c Modified: projects/fuse2/lib/libc/gen/getvfsbyname.c ============================================================================== --- projects/fuse2/lib/libc/gen/getvfsbyname.c Tue May 21 15:19:49 2019 (r348053) +++ projects/fuse2/lib/libc/gen/getvfsbyname.c Tue May 21 15:59:17 2019 (r348054) @@ -49,10 +49,11 @@ __FBSDID("$FreeBSD$"); static bool are_fusefs(const char *fsname, const char *vfc_name) { - const char fusefs[] = "fusefs"; - const char fusefs_dot[] = "fusefs."; + const static char fusefs[] = "fusefs"; + const static char fusefs_dot[] = "fusefs."; - return (strncmp(fsname, fusefs_dot, strlen(fusefs_dot)) == 0 && + + return (strncmp(fsname, fusefs_dot, sizeof(fusefs_dot) - 1) == 0 && strcmp(fusefs, vfc_name) == 0); }