pactl: Remove deprecated 'stat' behaviour

the stat command should only output statistics, not info

behaviour was deprecated anno 2011 in 8ace9185 "pactl: Make stat backwards
compatible" -- fix this now

v2: (thanks Tanu Kaskinen):
* adjust shell completion

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-10-30 16:00:41 +01:00 committed by Peter Meerwald
parent 31d5acdc78
commit 6d1fd4d1aa
4 changed files with 4 additions and 20 deletions

View file

@ -1201,14 +1201,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
switch (action) {
case STAT:
o = pa_context_stat(c, stat_callback, NULL);
if (short_list_format)
break;
if (o) {
pa_operation_unref(o);
actions++;
}
/* Fall through */
break;
case INFO:
o = pa_context_get_server_info(c, get_server_info_callback, NULL);
@ -1563,7 +1556,7 @@ static enum mute_flags parse_mute(const char *mute_text) {
static void help(const char *argv0) {
printf("%s %s %s\n", argv0, _("[options]"), "stat [short]");
printf("%s %s %s\n", argv0, _("[options]"), "stat");
printf("%s %s %s\n", argv0, _("[options]"), "info");
printf("%s %s %s %s\n", argv0, _("[options]"), "list [short]", _("[TYPE]"));
printf("%s %s %s\n", argv0, _("[options]"), "exit");
@ -1665,9 +1658,6 @@ int main(int argc, char *argv[]) {
if (optind < argc) {
if (pa_streq(argv[optind], "stat")) {
action = STAT;
short_list_format = false;
if (optind+1 < argc && pa_streq(argv[optind+1], "short"))
short_list_format = true;
} else if (pa_streq(argv[optind], "info"))
action = INFO;