diff options
| author | Christophe Varoqui <root@xa-s05.(none)> | 2005-12-16 21:48:37 +0100 |
|---|---|---|
| committer | Christophe Varoqui <root@xa-s05.(none)> | 2005-12-16 21:48:37 +0100 |
| commit | d1e62b7249b8f91132979eabb997e74ccc849cc5 (patch) | |
| tree | a386629bf0f3119cf95cb8b62964f48f9a7949bd /libmultipath | |
| parent | ae8d370095b229918f4b038e01f409a0a82e59a4 (diff) | |
| download | multipath-tools-d1e62b7249b8f91132979eabb997e74ccc849cc5.tar.gz multipath-tools-d1e62b7249b8f91132979eabb997e74ccc849cc5.tar.bz2 multipath-tools-d1e62b7249b8f91132979eabb997e74ccc849cc5.zip | |
[multipathd] change last CLI command syntax
"show multipaths" was confusing because "show maps" looks so awfuly close.
Now :
1) "multipaths" is a "maps" synomym
2) "show multipaths topology" shows what "show multipaths" did
There is a bit of function naming sanitizing in the lib too.
Diffstat (limited to 'libmultipath')
| -rw-r--r-- | libmultipath/configure.c | 4 | ||||
| -rw-r--r-- | libmultipath/print.c | 8 | ||||
| -rw-r--r-- | libmultipath/print.h | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/libmultipath/configure.c b/libmultipath/configure.c index 2df0fc9..e79ff12 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -287,7 +287,7 @@ domap (struct multipath * mpp) * last chance to quit before touching the devmaps */ if (conf->dry_run) { - print_mp(mpp, conf->verbosity); + print_multipath_topology(mpp, conf->verbosity); return 0; } @@ -357,7 +357,7 @@ domap (struct multipath * mpp) #ifndef DAEMON dm_switchgroup(mpp->alias, mpp->bestpg); if (mpp->action != ACT_NOTHING) - print_mp(mpp, conf->verbosity); + print_multipath_topology(mpp, conf->verbosity); #else mpp->stat_map_loads++; condlog(2, "%s: load table [0 %llu %s %s]", mpp->alias, diff --git a/libmultipath/print.c b/libmultipath/print.c index 67a5a9e..0cdf936 100644 --- a/libmultipath/print.c +++ b/libmultipath/print.c @@ -625,16 +625,18 @@ snprint_pathgroup (char * line, int len, char * format, } extern void -print_mp (struct multipath * mpp, int verbosity) +print_multipath_topology (struct multipath * mpp, int verbosity) { char buff[MAX_LINE_LEN * MAX_LINES]; - snprint_mp(&buff[0], MAX_LINE_LEN * MAX_LINES, mpp, verbosity); + snprint_multipath_topology(&buff[0], MAX_LINE_LEN * MAX_LINES, + mpp, verbosity); printf("%s", buff); } extern int -snprint_mp (char * buff, int len, struct multipath * mpp, int verbosity) +snprint_multipath_topology (char * buff, int len, struct multipath * mpp, + int verbosity) { int j, i, fwd = 0; struct path * pp = NULL; diff --git a/libmultipath/print.h b/libmultipath/print.h index 81a18e1..d4145ce 100644 --- a/libmultipath/print.h +++ b/libmultipath/print.h @@ -37,9 +37,10 @@ int snprint_path_header (char *, int, char *); int snprint_multipath_header (char *, int, char *); int snprint_path (char *, int, char *, struct path *); int snprint_multipath (char *, int, char *, struct multipath *); -int snprint_mp (char *, int, struct multipath * mpp, int verbosity); +int snprint_multipath_topology (char *, int, struct multipath * mpp, + int verbosity); -void print_mp (struct multipath * mpp, int verbosity); +void print_multipath_topology (struct multipath * mpp, int verbosity); void print_path (struct path * pp, char * style); void print_multipath (struct multipath * mpp, char * style); void print_pathgroup (struct pathgroup * pgp, char * style); |