- coding style

diff --git a/client/snapper/cmd-list-configs.cc b/client/snapper/cmd-list-configs.cc
index 345e2542ee6f5c72948966342234b979a3bb7038..91d661400783dea1e69ecb7dab6488ea80b95c6e 100644 (file)
--- a/client/snapper/cmd-list-configs.cc
+++ b/client/snapper/cmd-list-configs.cc
@@ -97,9 +97,9 @@ namespace snapper
 
 
        void
-       output_table(const vector<Column>& columns, Style style, ProxySnappers* snappers)
+       output_table(const GlobalOptions& global_options, const vector<Column>& columns, ProxySnappers* snappers)
        {
-           TableFormatter formatter(style);
+           TableFormatter formatter(global_options.table_style());
 
            for (Column column : columns)
                formatter.header().push_back(header_for(column));
@@ -120,10 +120,9 @@ namespace snapper
 
 
        void
-       output_csv(const GlobalOptions& global_options, const vector<Column>& columns, const string& separator,
-                  ProxySnappers* snappers)
+       output_csv(const GlobalOptions& global_options, const vector<Column>& columns, ProxySnappers* snappers)
        {
-           CsvFormatter formatter(separator, global_options.headers());
+           CsvFormatter formatter(global_options.separator(), global_options.headers());
 
            for (Column column : columns)
                formatter.header().push_back(toString(column));
@@ -195,11 +194,11 @@ namespace snapper
        switch (global_options.output_format())
        {
            case GlobalOptions::OutputFormat::TABLE:
-               output_table(columns, global_options.table_style(), snappers);
+               output_table(global_options, columns, snappers);
                break;
 
            case GlobalOptions::OutputFormat::CSV:
-               output_csv(global_options, columns, global_options.separator(), snappers);
+               output_csv(global_options, columns, snappers);
                break;
 
            case GlobalOptions::OutputFormat::JSON:

diff --git a/client/snapper/snapper.cc b/client/snapper/snapper.cc
index 0bf5e6ca7ea6f0fbb9e5aef900846fa4d727482d..cdd87861e5c39a3233155cf6189f764838701e01 100644 (file)
--- a/client/snapper/snapper.cc
+++ b/client/snapper/snapper.cc
@@ -55,8 +55,7 @@ struct Cmd
     typedef void (*help_func_t)();
 
     Cmd(const string& name, cmd_func_t cmd_func, help_func_t help_func, bool needs_snapper)
-       : name(name), aliases(), cmd_func(cmd_func), help_func(help_func),
-         needs_snapper(needs_snapper)
+       : name(name), cmd_func(cmd_func), help_func(help_func), needs_snapper(needs_snapper)
     {}
 
     Cmd(const string& name, const vector<string>& aliases, cmd_func_t cmd_func,