From: Pallavi Kadam Date: Thu, 11 Jun 2020 19:50:55 +0000 (-0700) Subject: eal/windows: fix warnings X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=d87f964ce6decd07f64091a36a55642b8960fd4e;p=dpdk.git eal/windows: fix warnings Fixed bunch of warnings when compiling using clang on Windows such as the use of an unsafe string function (strerror), [-Wunused-variable], [-Wunused-function] in eal_common_options.c [-Wunused-const-variable] in getopt.c and [-Wunused-parameter] in eal_common_thread.c. Also fixed warnings generated using Mingw: [-Werror=old-style-definition], [-Werror=cast-function-type] and [-Werror=attributes] Signed-off-by: Ranjit Menon Signed-off-by: Pallavi Kadam Tested-by: Narcisa Vasile Acked-by: Narcisa Vasile --- diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 8f2cbd1c68..0546beb3a0 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -18,7 +18,9 @@ #endif #include #include +#ifndef RTE_EXEC_ENV_WINDOWS #include +#endif #include #include @@ -115,8 +117,10 @@ struct shared_driver { static struct shared_driver_list solib_list = TAILQ_HEAD_INITIALIZER(solib_list); +#ifndef RTE_EXEC_ENV_WINDOWS /* Default path of external loadable drivers */ static const char *default_solib_dir = RTE_EAL_PMD_PATH; +#endif /* * Stringified version of solib path used by dpdk-pmdinfo.py @@ -329,6 +333,7 @@ eal_plugin_add(const char *path) return 0; } +#ifndef RTE_EXEC_ENV_WINDOWS static int eal_plugindir_init(const char *path) { @@ -362,6 +367,7 @@ eal_plugindir_init(const char *path) /* XXX this ignores failures from readdir() itself */ return (dent == NULL) ? 0 : -1; } +#endif int eal_plugins_init(void) @@ -394,8 +400,8 @@ eal_plugins_init(void) } } - return 0; #endif + return 0; } /* diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c index d084606a66..a34e519ead 100644 --- a/lib/librte_eal/windows/eal.c +++ b/lib/librte_eal/windows/eal.c @@ -139,7 +139,7 @@ eal_log_level_parse(int argc, char **argv) } /* Parse the argument given in the command line of the application */ -__attribute__((optnone)) static int +static int eal_parse_args(int argc, char **argv) { int opt, ret; diff --git a/lib/librte_eal/windows/eal_lcore.c b/lib/librte_eal/windows/eal_lcore.c index 82ee454134..b36f0a83b7 100644 --- a/lib/librte_eal/windows/eal_lcore.c +++ b/lib/librte_eal/windows/eal_lcore.c @@ -27,7 +27,7 @@ static struct _wcpu_map { * Create a map of all processors and associated cores on the system */ void -eal_create_cpu_map() +eal_create_cpu_map(void) { wcpu_map.total_procs = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS); diff --git a/lib/librte_eal/windows/eal_thread.c b/lib/librte_eal/windows/eal_thread.c index 4c1e31c58a..3dd56519c9 100644 --- a/lib/librte_eal/windows/eal_thread.c +++ b/lib/librte_eal/windows/eal_thread.c @@ -140,7 +140,8 @@ eal_thread_create(pthread_t *thread) { HANDLE th; - th = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)eal_thread_loop, + th = CreateThread(NULL, 0, + (LPTHREAD_START_ROUTINE)(ULONG_PTR)eal_thread_loop, NULL, 0, (LPDWORD)thread); if (!th) return -1; diff --git a/lib/librte_eal/windows/getopt.c b/lib/librte_eal/windows/getopt.c index 170c9b5e0c..a08f7c109b 100644 --- a/lib/librte_eal/windows/getopt.c +++ b/lib/librte_eal/windows/getopt.c @@ -25,8 +25,8 @@ int opterr = 1; /* if error message should be printed */ int optind = 1; /* index into parent argv vector */ int optopt = '?'; /* character checked for validity */ -static void pass(void) {} -#define warnx(a, ...) pass() +static void pass(const char *a) {(void) a; } +#define warnx(a, ...) pass(a) #define PRINT_ERROR ((opterr) && (*options != ':')) diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/librte_eal/windows/include/pthread.h index 0bbed5c3b8..e2274cf4e9 100644 --- a/lib/librte_eal/windows/include/pthread.h +++ b/lib/librte_eal/windows/include/pthread.h @@ -45,7 +45,7 @@ typedef SYNCHRONIZATION_BARRIER pthread_barrier_t; #define pthread_getaffinity_np(thread, size, cpuset) \ eal_get_thread_affinity_mask(thread, (unsigned long *) cpuset) #define pthread_create(threadid, threadattr, threadfunc, args) \ - eal_create_thread(threadid, threadfunc, args) + eal_create_thread(threadid, threadattr, threadfunc, args) static inline int eal_set_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) @@ -70,8 +70,10 @@ eal_get_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) } static inline int -eal_create_thread(void *threadid, void *threadfunc, void *args) +eal_create_thread(void *threadid, const void *threadattr, void *threadfunc, + void *args) { + RTE_SET_USED(threadattr); HANDLE hThread; hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)threadfunc, args, 0, (LPDWORD)threadid);