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 4063943D73;
Fri, 29 Mar 2024 00:52:23 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id ABC4C4161A;
Fri, 29 Mar 2024 00:52:11 +0100 (CET)
Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com
[209.85.210.42]) by mails.dpdk.org (Postfix) with ESMTP id 9E1AB40A6E
for <dev@dpdk.org>; Fri, 29 Mar 2024 00:52:08 +0100 (CET)
Received: by mail-ot1-f42.google.com with SMTP id
46e09a7af769-6e6a9e2e2b6so835488a34.1
for <dev@dpdk.org>; Thu, 28 Mar 2024 16:52:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1711669928;
x=1712274728; 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=fXDP3EAZszW3khXLJCW9HzY/EWyn/YIYnt+aFG//6+m6TCU92UY8hkdcROO0gHDH5E
bvNG3rkVEFf/s13kaiSssQ0e66856M+7s8mYUY432JZR9AwCHSuxh8BHHM8Xi67tttGq
ZhoO5pq3glZviA6e1v1hXA9Mj1xTj4dUgXMz6xqwBiB5/2L3bdyxk7RGGaIDg4JRcyTv
lYqVaXINIRwd1PbZxF4uyNhEx4V2YkGf2w7yJEpTGa3ba5MreVQm8lD6n0viKENzxGev
JvdSgxf3/LLWT4O/RnMd3i6TEXQo845NGucaxlnMGusYyZMzb5yvioN3Jc137atF+/hJ
8V6w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1711669928; x=1712274728;
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=C46hbn0YqAYG6jioT82z9p4D/GZWBw30IrzKkQwA3U07afTv0pZUjXm89ncEFsLxAr
hT4ctlcSEpXye4PaSAZZL4+LBGuzRuYjCg2fU0K1J2/PUAaocoCIOYSzyXfRLvBjqGi7
rUg1q7eBdwA6O5ZxPn83VuOYTRo9eciNQfwZzrG3bC+qBz9RdehNbrcqW+CV0rLiD1Pd
G2Jb4ZGkUZvGPZKmDSYDWVzW4nRfrSNI/V4jt7jQ3trv+T2TBN/O3U98kEFINRZGRcFL
f36hN6tra2QqmqjwuzfxNcA+XfU5vMnZQOdjGCNGMfW6jY09kv3NN3f/RL12SUSEyvjx
PcXQ==
X-Gm-Message-State: AOJu0YzeoO722Qeh+8FaGA10lDeN/t3s/sB7Aw0++81R89+m/RJ6hFVr
e4vXteu7jJ1R3EbxE+qyhePXGWaHcZ77Gx5rMBv5tyHIcP55omowPYe81LjRlfSpFIiak+/bXkM
B
X-Google-Smtp-Source: AGHT+IEKygypftkPcFdbBZEz3J/H/nkamnI7BotvDQQcEPiS7ZLJwONLIFIueC5iE6swEhEoRXfRpQ==
X-Received: by 2002:a9d:7495:0:b0:6e4:4393:8565 with SMTP id
t21-20020a9d7495000000b006e443938565mr811904otk.25.1711669927800;
Thu, 28 Mar 2024 16:52:07 -0700 (PDT)
Received: from hermes.local (204-195-123-203.wavecable.com. [204.195.123.203])
by smtp.gmail.com with ESMTPSA id
g21-20020a631115000000b005df58c83e89sm1875650pgl.84.2024.03.28.16.52.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 28 Mar 2024 16:52:07 -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 v18 02/15] windows: make getopt functions have const properties
Date: Thu, 28 Mar 2024 16:49:32 -0700
Message-ID: <20240328235156.5768-3-stephen@networkplumber.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240328235156.5768-1-stephen@networkplumber.org>
References: <20200814173441.23086-1-stephen@networkplumber.org>
<20240328235156.5768-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