[src/trunk]: src/usr.bin/make make: use more common parameter order for VarSe...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15ce13e5a025
branches:  trunk
changeset: 952985:15ce13e5a025
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Feb 22 23:42:29 2021 +0000

description:
make: use more common parameter order for VarSelectWords

No functional change.

diffstat:

 usr.bin/make/var.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 7fa2346de498 -r 15ce13e5a025 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Mon Feb 22 23:39:24 2021 +0000
+++ b/usr.bin/make/var.c        Mon Feb 22 23:42:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.839 2021/02/22 23:39:24 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.840 2021/02/22 23:42:29 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.839 2021/02/22 23:39:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.840 2021/02/22 23:42:29 rillig Exp $");
 
 typedef enum VarFlags {
        VFL_NONE        = 0,
@@ -1737,8 +1737,8 @@
  * It can also reverse the words.
  */
 static char *
-VarSelectWords(char sep, Boolean oneBigWord, const char *str, int first,
-              int last)
+VarSelectWords(const char *str, int first, int last,
+              char sep, Boolean oneBigWord)
 {
        Words words;
        int len, start, end, step;
@@ -3150,8 +3150,8 @@
 
        /* Normal case: select the words described by first and last. */
        Expr_SetValueOwn(expr,
-           VarSelectWords(st->sep, st->oneBigWord, expr->value.str,
-               first, last));
+           VarSelectWords(expr->value.str, first, last,
+               st->sep, st->oneBigWord));
 
 ok:
        free(estr);