From nobody Thu Apr 2 09:48:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fmcW36xjPz6Y7XW for ; Thu, 02 Apr 2026 09:48:47 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmcW33j3nz42Ny for ; Thu, 02 Apr 2026 09:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775123327; h=from:from: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; bh=PhlBzZUMgjQMbasVxhKlQtrsHImK332fMfSJn/At1/Y=; b=xe/qeKUlwpRwnpfw6Lq6fzB87XJi7Uz7T1iRKCHVhjxGwBhuP5pppDxYQd6H8X6qttF+2L TiE6sogBPHm9F7WuD/UAihQUBgApNbbFUVRCNjGbx5yH1YwHXnUbg2xQOSdkN1PY3zwyp8 Zsb8LjJxa7kExIWE6lWOe5EMdSPilkY68id32nxC0RkAgxmWv8m8pJN25KdSYUt2vvjIZf XrAE8XjfhJHcrcB5PqvkiMntzUMfqODMUnVX5IAU1lLXuba5vJExbH7vAtClifoSRWtz8z 2ugUoCUZopEbPl50IpvIS3DxhhNNMErO/XOKAaysBGTkK45l+cF7HE7MwU50fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775123327; a=rsa-sha256; cv=none; b=UoZHwNzsLrUOxC3wsRA0eTikhdYZV32Kekeoj35bVr8Y3PHKSA93zfAVwLbTU36BcYGRdM rtdVbgy5iLN0ijFSNyZjbgqVMzcZlq4VPvaJCL0e3b/0/4/6isyCikKZhFeey2xe1dAPcN lc4/HYhyGntB5NzfrCep2YgJkE+wTycLo4I0TCmRFwNGmuEJV3JgiicxnjHhUB67tonqMn zUwxwmxy/32EejLh94uSeOMbjK4apzzMN8VSyCFBe0Nwr0Y4cLyid1KY79/YcZgwaHXG4F WyxIWSY69zr3IhyH3KLOlHTUX6tIuurUPAVFDaQu1BkBZw4LecriE4lL1vjeIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775123327; h=from:from: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; bh=PhlBzZUMgjQMbasVxhKlQtrsHImK332fMfSJn/At1/Y=; b=i4SqVm5BruCzwR8A4vMkfRTz+4j0d5zd/EaXTMSfme1n7d4oq+SXM7Jy8kbI39nuSs8syJ dxbTusvb+1Xb4FkPo6370nK4Ao1oBXADjmHrbbStu8lLHmOPTL1dwTfWrZUe4+U0EkqFKD a59UzW/q8kDmpxAfey+NvyBRKPl5zBqxwKt4BJf0j/BrWeZAdpZIZfvqNLUPJr/TpcBveK YYPms40xA4028c95krFOEhAk8H4VPbJ6zOzyGuUyexP6X5NspvJV8jxr9aiXbq8FdIlevo JeFy1AXInvB6xuamISoCLKOBAdMtWA9yWJViFGAdFCag2GuFqSZ9XRQuoktFsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmcW335R7zx6C for ; Thu, 02 Apr 2026 09:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bba6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 09:48:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3396afba986b - stable/14 - m4: Misc style fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3396afba986bb8f6cfa334a1c324552b5f355f1a Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 09:48:47 +0000 Message-Id: <69ce3b7f.3bba6.6e9f0cd4@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3396afba986bb8f6cfa334a1c324552b5f355f1a commit 3396afba986bb8f6cfa334a1c324552b5f355f1a Author: Dag-Erling Smørgrav AuthorDate: 2026-03-25 00:41:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-02 09:47:59 +0000 m4: Misc style fixes MFC after: 1 week Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D55794 (cherry picked from commit 41474e78c493184f023723d1f86539e07bb01b92) --- usr.bin/m4/eval.c | 18 +++++++++--------- usr.bin/m4/expr.c | 2 +- usr.bin/m4/look.c | 17 +++++++++-------- usr.bin/m4/main.c | 5 ++--- usr.bin/m4/mdef.h | 2 +- usr.bin/m4/misc.c | 12 +++++------- 6 files changed, 27 insertions(+), 29 deletions(-) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 71be6f305dee..4f088e0415e0 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -298,7 +298,7 @@ expand_builtin(const char *argv[], int argc, int td) case PASTETYPE: if (argc > 2) if (!dopaste(argv[2])) - err(1, "%s at line %lu: paste(%s)", + err(1, "%s at line %lu: paste(%s)", CURRENT_NAME, CURRENT_LINE, argv[2]); break; @@ -353,7 +353,7 @@ expand_builtin(const char *argv[], int argc, int td) errstr, argv[2]); if (n != 0) { dodivert(n); - break; + break; } } active = stdout; @@ -900,11 +900,11 @@ dosubstr(const char *argv[], int argc) * map every character of s1 that is specified in from * into s3 and replace in s. (source s1 remains untouched) * - * This is derived from the a standard implementation of map(s,from,to) - * function of ICON language. Within mapvec, we replace every character - * of "from" with the corresponding character in "to". - * If "to" is shorter than "from", than the corresponding entries are null, - * which means that those characters disappear altogether. + * This is derived from the a standard implementation of map(s,from,to) + * function of ICON language. Within mapvec, we replace every character + * of "from" with the corresponding character in "to". + * If "to" is shorter than "from", than the corresponding entries are null, + * which means that those characters disappear altogether. */ static void map(char *dest, const char *src, const char *from, const char *to) @@ -994,7 +994,7 @@ handledash(char *buffer, char *end, const char *src) if (src[1] == '-' && src[2]) { unsigned char i; if ((unsigned char)src[0] <= (unsigned char)src[2]) { - for (i = (unsigned char)src[0]; + for (i = (unsigned char)src[0]; i <= (unsigned char)src[2]; i++) { *p++ = i; if (p == end) { @@ -1003,7 +1003,7 @@ handledash(char *buffer, char *end, const char *src) } } } else { - for (i = (unsigned char)src[0]; + for (i = (unsigned char)src[0]; i >= (unsigned char)src[2]; i--) { *p++ = i; if (p == end) { diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c index 7910403d74f0..859be1557d83 100644 --- a/usr.bin/m4/expr.c +++ b/usr.bin/m4/expr.c @@ -32,7 +32,7 @@ int yyerror(const char *msg) { fprintf(stderr, "m4: %s in expr %s\n", msg, copy_toeval); - return(0); + return 0; } int diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c index a7e6d87b0494..c1fccd7dd8e5 100644 --- a/usr.bin/m4/look.c +++ b/usr.bin/m4/look.c @@ -137,8 +137,8 @@ static ndptr create_entry(const char *name) { const char *end = NULL; - unsigned int i; ndptr n; + unsigned int i; i = ohash_qlookupi(¯os, name, &end); n = ohash_find(¯os, i); @@ -156,6 +156,7 @@ void macro_define(const char *name, const char *defn) { ndptr n = create_entry(name); + if (n->d != NULL) { if (n->d->defn != null) free_definition(n->d->defn); @@ -183,6 +184,7 @@ void macro_undefine(const char *name) { ndptr n = lookup(name); + if (n != NULL) { struct macro_definition *r, *r2; @@ -295,21 +297,21 @@ keep(char *ptr) kept_capacity *= 2; else kept_capacity = 50; - kept = xreallocarray(kept, kept_capacity, - sizeof(char *), "Out of memory while saving %d strings\n", + kept = xreallocarray(kept, kept_capacity, + sizeof(char *), "Out of memory while saving %d strings\n", kept_capacity); } kept[kept_size++] = ptr; } static int -string_in_use(const char *ptr) +string_in_use(const char *ptr) { int i; - for (i = 0; i <= sp; i++) { + + for (i = 0; i <= sp; i++) if (sstack[i] == STORAGE_MACRO && mstack[i].sstr == ptr) return 1; - } return 0; } @@ -324,7 +326,7 @@ free_definition(char *ptr) if (!string_in_use(kept[i])) { kept_size--; free(kept[i]); - if (i != kept_size) + if (i != kept_size) kept[i] = kept[kept_size]; i--; } @@ -336,4 +338,3 @@ free_definition(char *ptr) else free(ptr); } - diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index 6e4e79b2a414..5daae7fd22c2 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -86,7 +86,7 @@ int maxout; FILE *active; /* active output file pointer */ int ilevel = 0; /* input file stack pointer */ int oindex = 0; /* diversion index.. */ -const char *null = ""; /* as it says.. just a null.. */ +const char *null = ""; /* as it says.. just a null.. */ char **m4wraps = NULL; /* m4wraps array. */ int maxwraps = 0; /* size of m4wraps array */ int wrapindex = 0; /* current offset in m4wraps */ @@ -388,8 +388,7 @@ macro(void) CHRSAVE(l); } } - } - while (nlpar != 0); + } while (nlpar != 0); } else if (sp < 0 && LOOK_AHEAD(t, scommt)) { reallyoutputstr(scommt); diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h index 86960e3741e1..424bdc91b241 100644 --- a/usr.bin/m4/mdef.h +++ b/usr.bin/m4/mdef.h @@ -206,7 +206,7 @@ struct input_file { mstack[sp].sstr = macro_getdef(p)->defn;\ sstack[sp] = STORAGE_MACRO; \ } while (0) - + /* * . . diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index ca37dc3c4593..84aeac6c27b5 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -136,8 +136,7 @@ pbnumbase(int n, int base, int d) do { pushback(digits[num % base]); printed++; - } - while ((num /= base) > 0); + } while ((num /= base) > 0); while (printed++ < d) pushback('0'); @@ -154,8 +153,7 @@ pbunsigned(unsigned long n) { do { pushback(n % 10 + '0'); - } - while ((n /= 10) > 0); + } while ((n /= 10) > 0); } void @@ -187,9 +185,9 @@ enlarge_strspace(void) memcpy(newstrspace, strspace, strsize/2); for (i = 0; i <= sp; i++) if (sstack[i] == STORAGE_STRSPACE) - mstack[i].sstr = (mstack[i].sstr - strspace) - + newstrspace; - ep = (ep-strspace) + newstrspace; + mstack[i].sstr = (mstack[i].sstr - strspace) + + newstrspace; + ep = (ep - strspace) + newstrspace; free(strspace); strspace = newstrspace; endest = strspace + strsize;