From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id C249B43D5B;
Wed, 27 Mar 2024 01:29:25 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 267D6410E6;
Wed, 27 Mar 2024 01:29:15 +0100 (CET)
Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com
[209.85.216.46]) by mails.dpdk.org (Postfix) with ESMTP id 614F8402A3
for <dev@dpdk.org>; Wed, 27 Mar 2024 01:29:11 +0100 (CET)
Received: by mail-pj1-f46.google.com with SMTP id
98e67ed59e1d1-29f9bffaa3bso4125142a91.0
for <dev@dpdk.org>; Tue, 26 Mar 2024 17:29:11 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1711499350;
x=1712104150; 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=j2bWaQew6uFbTYM7AsbymK+bBIaNZpLFH5iS8177eDI=;
b=lPNMIxgi1X4k7W45F8FJg+Sw9jSYrKJ/xvnF2nGq33fUTN9ABiun24AW35fdO1duD3
PL4be+VihNpOAiExSVsPmUhV2D+ojFwsAFf8PyElkatMtBltC/RJWTqWinMkVlMGD5z7
QhXyFBWFXixAGjiYKJ6YxbGS8Bv8PpDVcWr9NhHY3lwPo69sFjPZ3IUEyVlV22QzVp7d
OcnoFpXwbMCp9XEHw3lNrHB7Qgk1J3NoWQkK2+ixrCRvExMUpHiqfjfI1/oYG1b6xy08
H4QlfMkCFyio/NJYQnYMXU/mrYBjMFzC3PW2pmrXdGJ6BuPzmoNz9GLHUlHUhkmceCHo
Y3MQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1711499350; x=1712104150;
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=j2bWaQew6uFbTYM7AsbymK+bBIaNZpLFH5iS8177eDI=;
b=gO+TKssuuSXMbrbmYhQpgzHrUzjZsBqjC8yMRdxAIIrBjJDmtG60ySZW0aGnNuKQg4
M7YbmmB0mLQ3Fmf1B1tJJI6zYRuyS0uzjHkffceXYazUhteEhT4kOKDvpr6USnj4gqOp
qEO0pzP08vo/xwWmiIgqQ7fjIxJvMv0ZGE5f8OPFxasF5uY7dJYf49P/7buggz5ZmnTx
6nfofghtEQWVltCw1MYfrZ8PXFiFtDDg3tdjE21AFzTlkv2Brk96inYcv6HT8Yi5Xm7y
8I+PGab1qeuJBMRDW++ZD5kNGLTDaiE4aINhuQDC6MpN1F5a7bKVo0iPkTUYrNhnfnJz
UuxA==
X-Gm-Message-State: AOJu0Yyy9/djzIYE1/X50pJ13OhKVH7NjxCDdCJFliW1ADcrgzsJfBT4
4+qX+H0uRhc2HCE0flJrBTwzXYPG3oe/9RVoTznABmGnHbNlcNAYhWH4NuugTdkjRkiwaP5gk7o
/
X-Google-Smtp-Source: AGHT+IFcmNZnzkbhbbeABc6WWkQ0tIwo5O72rF4tuX7GDc+01ZhjZ6vPJQluXLQN0EtfkY2a7rrT2Q==
X-Received: by 2002:a17:90b:46c7:b0:299:3035:aede with SMTP id
jx7-20020a17090b46c700b002993035aedemr2426059pjb.44.1711499350534;
Tue, 26 Mar 2024 17:29:10 -0700 (PDT)
Received: from hermes.local (204-195-123-203.wavecable.com. [204.195.123.203])
by smtp.gmail.com with ESMTPSA id
w15-20020a17090ad60f00b002a04eef22c5sm225383pju.44.2024.03.26.17.29.09
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 26 Mar 2024 17:29:10 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Tyler Retzlaff <roretzla@linux.microsoft.com>,
Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
Pallavi Kadam <pallavi.kadam@intel.com>
Subject: [PATCH v15 02/15] windows: make getopt functions have const properties
Date: Tue, 26 Mar 2024 17:27:01 -0700
Message-ID: <20240327002859.203006-3-stephen@networkplumber.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240327002859.203006-1-stephen@networkplumber.org>
References: <20200814173441.23086-1-stephen@networkplumber.org>
<20240327002859.203006-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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=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 <stephen@networkplumber.org>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
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 a1f51c6c23..50ff71b930 100644
--- a/lib/eal/windows/getopt.c
+++ b/lib/eal/windows/getopt.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <stdlib.h>
-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 6f57af454b..e4cf6873cb 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