From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0F29A43D17; Thu, 21 Mar 2024 17:18:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDD5042E05; Thu, 21 Mar 2024 17:18:24 +0100 (CET) Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) by mails.dpdk.org (Postfix) with ESMTP id 6CDEC427E1 for ; Thu, 21 Mar 2024 17:18:23 +0100 (CET) Received: by mail-yb1-f170.google.com with SMTP id 3f1490d57ef6-dcd7c526cc0so1235970276.1 for ; Thu, 21 Mar 2024 09:18:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1711037903; x=1711642703; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Hf75PC3cGL3/aHUnTvzOVFoCo+jxSQLWlI0Kn+D/zko=; b=DPcQHNpaTg4i/sYKty6MkL8JJ6/Gg1Du1YU2RSb3GQ+x5iwG+k44REJ0To8H+6NsSG Mcdn8QCq68UfBqIrnruPhbyt91DSq6rbtulGDunj14Ora4W5zAGcCVtzcnqX2MFuk6kA e0DmLTGpiz+z1GGw8ds76ybSnvc8RbQAKPbCuUh0XDfQAyqz2emBCxhFuByVUiCsfRxp yYLAeBR13y8ovYmRWNmMzZNp1D+n+CB1vbl79NLJ/ZfeCqkcDI6+VDWNbNVr3gLrrYKu gO4fKpt4h+KdnuonXy1Rd/SPbKn9m6m3w9Oe27hQuU//JXzOClI3HrJ+wB45senyCRpj IMOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711037903; x=1711642703; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hf75PC3cGL3/aHUnTvzOVFoCo+jxSQLWlI0Kn+D/zko=; b=EfnxAaMa06tv0Ohi3i/rKlXJbV2MfO64Qqj1hW4XBMZwnfe/Z2k6+Lq9QIAuVlIjeo zx8X/dqhZvJqlIpbdjLt+ySFqZo6ugawplrJWd4jVdZuTUW0XzwmYNpZr6Mns3UFum86 sqzz27xUx4jfrFhYXNky/Y6Y3cjMup9Bsnso61e2Nf0SxwYfVH6fq43vtWu/MOiFzbWa Phhi71qBYproj3uhiEFytLGObvoxXSfyZaUrVw5TNZkAGsaWAiC5dNIZnsp0g67aj0Kk 1ozmgfoqI1b3VhBZcbd6J3EUEQwK7U9XytXoNCqAVVk1w7qr8d6yW2Lih1eWzS5t96TK FPWg== X-Gm-Message-State: AOJu0YwxVdxJL65z6yHNnmKPFWZPz2mNJKHwLJCJYAgN+HAE0u8RnqeE lX6imyayOCzGDChZi3MpMkr46S/6rivaMlmqhit0hQoQptrrC8RrKKz5dWSlp2D0t5qw36gzQgl J X-Google-Smtp-Source: AGHT+IGyy1NRs56yUVIwhlz0kcEKO0QFToMVjiNofnMuT/gxMrPXkbyatDFJb2ulED2iGTbdefm9WA== X-Received: by 2002:a05:6a20:438f:b0:1a3:59ac:a626 with SMTP id i15-20020a056a20438f00b001a359aca626mr6962224pzl.41.1711037517358; Thu, 21 Mar 2024 09:11:57 -0700 (PDT) Received: from hermes.local (204-195-123-203.wavecable.com. [204.195.123.203]) by smtp.gmail.com with ESMTPSA id w62-20020a638241000000b005e485fbd455sm41815pgd.45.2024.03.21.09.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 09:11:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Tyler Retzlaff , Dmitry Kozlyuk Subject: [PATCH v10 01/10] windows: make getopt functions have const properties Date: Thu, 21 Mar 2024 09:00:17 -0700 Message-ID: <20240321161146.340421-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240321161146.340421-1-stephen@networkplumber.org> References: <20200814173441.23086-1-stephen@networkplumber.org> <20240321161146.340421-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Having different prototypes on different platforms can lead to lots of unnecessary workarounds. Looks like the version of getopt used from windows was based on an older out of date version from FreeBSD. This patch changes getopt, getopt_long, etc to have the same const attributes as Linux and FreeBSD. The changes are derived from the current FreeBSD version of getopt_long. Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff Acked-by: Dmitry Kozlyuk --- lib/eal/windows/getopt.c | 23 ++++++++++++----------- lib/eal/windows/include/getopt.h | 8 ++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/eal/windows/getopt.c b/lib/eal/windows/getopt.c index a1f51c6c2318..50ff71b9300d 100644 --- a/lib/eal/windows/getopt.c +++ b/lib/eal/windows/getopt.c @@ -20,7 +20,7 @@ #include #include -const char *optarg; /* argument associated with option */ +char *optarg; /* argument associated with option */ int opterr = 1; /* if error message should be printed */ int optind = 1; /* index into parent argv vector */ int optopt = '?'; /* character checked for validity */ @@ -39,9 +39,9 @@ static void pass(const char *a) {(void) a; } #define BADARG ((*options == ':') ? (int)':' : (int)'?') #define INORDER 1 -#define EMSG "" +static char EMSG[] = ""; -static const char *place = EMSG; /* option letter processing */ +static char *place = EMSG; /* option letter processing */ /* XXX: set optreset to 1 rather than these two */ static int nonopt_start = -1; /* first non option argument (for permute) */ @@ -80,7 +80,7 @@ gcd(int a, int b) */ static void permute_args(int panonopt_start, int panonopt_end, int opt_end, - char **nargv) + char * const *nargv) { int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; char *swap; @@ -101,11 +101,12 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end, pos -= nnonopts; else pos += nopts; + swap = nargv[pos]; /* LINTED const cast */ - ((char **) nargv)[pos] = nargv[cstart]; + ((char **)(uintptr_t)nargv)[pos] = nargv[cstart]; /* LINTED const cast */ - ((char **)nargv)[cstart] = swap; + ((char **)(uintptr_t)nargv)[cstart] = swap; } } } @@ -116,7 +117,7 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end, * Returns -1 if short_too is set and the option does not match long_options. */ static int -parse_long_options(char **nargv, const char *options, +parse_long_options(char * const *nargv, const char *options, const struct option *long_options, int *idx, int short_too) { const char *current_argv; @@ -236,7 +237,7 @@ parse_long_options(char **nargv, const char *options, * Parse argc/argv argument vector. Called by user level routines. */ static int -getopt_internal(int nargc, char **nargv, const char *options, +getopt_internal(int nargc, char *const nargv[], const char *options, const struct option *long_options, int *idx, int flags) { char *oli; /* option letter list index */ @@ -434,7 +435,7 @@ getopt_internal(int nargc, char **nargv, const char *options, * Parse argc/argv argument vector. */ int -getopt(int nargc, char *nargv[], const char *options) +getopt(int nargc, char *const nargv[], const char *options) { return getopt_internal(nargc, nargv, options, NULL, NULL, FLAG_PERMUTE); @@ -445,7 +446,7 @@ getopt(int nargc, char *nargv[], const char *options) * Parse argc/argv argument vector. */ int -getopt_long(int nargc, char *nargv[], const char *options, +getopt_long(int nargc, char *const nargv[], const char *options, const struct option *long_options, int *idx) { @@ -458,7 +459,7 @@ getopt_long(int nargc, char *nargv[], const char *options, * Parse argc/argv argument vector. */ int -getopt_long_only(int nargc, char *nargv[], const char *options, +getopt_long_only(int nargc, char *const nargv[], const char *options, const struct option *long_options, int *idx) { diff --git a/lib/eal/windows/include/getopt.h b/lib/eal/windows/include/getopt.h index 6f57af454b17..e4cf6873cb0c 100644 --- a/lib/eal/windows/include/getopt.h +++ b/lib/eal/windows/include/getopt.h @@ -44,7 +44,7 @@ /** argument to current option, or NULL if it has none */ -extern const char *optarg; +extern char *optarg; /** Current position in arg string. Starts from 1. * Setting to 0 resets state. */ @@ -80,14 +80,14 @@ struct option { }; /** Compat: getopt */ -int getopt(int argc, char *argv[], const char *options); +int getopt(int argc, char *const argv[], const char *options); /** Compat: getopt_long */ -int getopt_long(int argc, char *argv[], const char *options, +int getopt_long(int argc, char *const argv[], const char *options, const struct option *longopts, int *longindex); /** Compat: getopt_long_only */ -int getopt_long_only(int nargc, char *argv[], const char *options, +int getopt_long_only(int nargc, char *const argv[], const char *options, const struct option *long_options, int *idx); -- 2.43.0