SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmcli: coding style fixes in the new JSON output support

Browse Source
This commit is contained in:
Aleksander Morgado
2019-08-28 18:17:55 +02:00
parent d1ac5ca16b
commit ae55fbf964
2 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/mmcli.c
+9 -2
View File
@@ -246,12 +246,19 @@ main (gint argc, gchar **argv)
g_printerr ("error: only one output type supported at the same time\n");
exit (EXIT_FAILURE);
}
if (output_keyvalue_flag || output_json_flag) {
if (output_keyvalue_flag) {
if (verbose_flag) {
g_printerr ("error: cannot set verbose output in keyvalue output type\n");
exit (EXIT_FAILURE);
}
mmcli_output_set (output_keyvalue_flag ? MMC_OUTPUT_TYPE_KEYVALUE : MMC_OUTPUT_TYPE_JSON);
mmcli_output_set (MMC_OUTPUT_TYPE_KEYVALUE);
}
else if (output_json_flag) {
if (verbose_flag) {
g_printerr ("error: cannot set verbose output in JSON output type\n");
exit (EXIT_FAILURE);
}
mmcli_output_set (MMC_OUTPUT_TYPE_JSON);
} else {
mmcli_output_set (MMC_OUTPUT_TYPE_HUMAN);
}