aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Black <[email protected]>2020-01-08 20:50:05 -0500
committerBrian Behlendorf <[email protected]>2020-01-08 17:50:05 -0800
commit4abd7d80b2904135a9518cebf190f36f4f3fa3a8 (patch)
tree41c354b69608f222ba550ab69667e3c47bbf8a09
parentf8d55b95a5ed825d4fb50cc8e0e03edf25bd44e3 (diff)
Remove parameter names from libzfs.h signatures
Most of libzfs.h doesn't provide names for the parameters in its signatures. These few functions included them. That wouldn't be a problem, per se, but the 'lines' parameter conflicts with the 'lines' #define from terminfo's term.h, present for at least a decade. This makes it difficult to compile code making use of both ZFS and terminfo. Reviewed-by: Matt Ahrens <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Igor Kozhukhov <[email protected]> Reviewed-by: Kjeld Schouten <[email protected]> Signed-off-by: Nick Black <[email protected]> Closes #9821
-rw-r--r--include/libzfs.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/libzfs.h b/include/libzfs.h
index 8e9f6fb3f..0518c800e 100644
--- a/include/libzfs.h
+++ b/include/libzfs.h
@@ -821,15 +821,15 @@ extern int zfs_nicestrtonum(libzfs_handle_t *, const char *, uint64_t *);
#define STDERR_VERBOSE 0x02
#define NO_DEFAULT_PATH 0x04 /* Don't use $PATH to lookup the command */
-int libzfs_run_process(const char *, char **, int flags);
-int libzfs_run_process_get_stdout(const char *path, char *argv[], char *env[],
- char **lines[], int *lines_cnt);
-int libzfs_run_process_get_stdout_nopath(const char *path, char *argv[],
- char *env[], char **lines[], int *lines_cnt);
+int libzfs_run_process(const char *, char **, int);
+int libzfs_run_process_get_stdout(const char *, char *[], char *[],
+ char **[], int *);
+int libzfs_run_process_get_stdout_nopath(const char *, char *[], char *[],
+ char **[], int *);
-void libzfs_free_str_array(char **strs, int count);
+void libzfs_free_str_array(char **, int);
-int libzfs_envvar_is_set(char *envvar);
+int libzfs_envvar_is_set(char *);
/*
* Utility functions for zfs version