cli: consistently use spaces for indentation
This commit is contained in:

committed by
Aleksander Morgado

parent
5d47478d06
commit
d4177f554b
@@ -63,17 +63,17 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_bearer_get_option_group (void)
|
mmcli_bearer_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
/* Status options */
|
/* Status options */
|
||||||
group = g_option_group_new ("bearer",
|
group = g_option_group_new ("bearer",
|
||||||
"Bearer options",
|
"Bearer options",
|
||||||
"Show bearer options",
|
"Show bearer options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -1100,17 +1100,17 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_get_common_option_group (void)
|
mmcli_get_common_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
/* Status options */
|
/* Status options */
|
||||||
group = g_option_group_new ("common",
|
group = g_option_group_new ("common",
|
||||||
"Common options",
|
"Common options",
|
||||||
"Show common options",
|
"Show common options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
const gchar *
|
const gchar *
|
||||||
|
@@ -71,17 +71,17 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_manager_get_option_group (void)
|
mmcli_manager_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
/* Status options */
|
/* Status options */
|
||||||
group = g_option_group_new ("manager",
|
group = g_option_group_new ("manager",
|
||||||
"Manager options",
|
"Manager options",
|
||||||
"Show manager options",
|
"Show manager options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -89,16 +89,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_3gpp_get_option_group (void)
|
mmcli_modem_3gpp_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("3gpp",
|
group = g_option_group_new ("3gpp",
|
||||||
"3GPP options",
|
"3GPP options",
|
||||||
"Show 3GPP related options",
|
"Show 3GPP related options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -67,16 +67,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_cdma_get_option_group (void)
|
mmcli_modem_cdma_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("cdma",
|
group = g_option_group_new ("cdma",
|
||||||
"CDMA options",
|
"CDMA options",
|
||||||
"Show CDMA related options",
|
"Show CDMA related options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -62,16 +62,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_firmware_get_option_group (void)
|
mmcli_modem_firmware_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("firmware",
|
group = g_option_group_new ("firmware",
|
||||||
"Firmware options",
|
"Firmware options",
|
||||||
"Show Firmware options",
|
"Show Firmware options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -123,16 +123,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_location_get_option_group (void)
|
mmcli_modem_location_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("location",
|
group = g_option_group_new ("location",
|
||||||
"Location options",
|
"Location options",
|
||||||
"Show Location options",
|
"Show Location options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -78,16 +78,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_messaging_get_option_group (void)
|
mmcli_modem_messaging_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("messaging",
|
group = g_option_group_new ("messaging",
|
||||||
"Messaging options",
|
"Messaging options",
|
||||||
"Show Messaging options",
|
"Show Messaging options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -83,16 +83,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_oma_get_option_group (void)
|
mmcli_modem_oma_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("oma",
|
group = g_option_group_new ("oma",
|
||||||
"OMA options",
|
"OMA options",
|
||||||
"Show OMA options",
|
"Show OMA options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -62,16 +62,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_signal_get_option_group (void)
|
mmcli_modem_signal_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("signal",
|
group = g_option_group_new ("signal",
|
||||||
"Signal options",
|
"Signal options",
|
||||||
"Show Signal options",
|
"Show Signal options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -67,16 +67,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_simple_get_option_group (void)
|
mmcli_modem_simple_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("simple",
|
group = g_option_group_new ("simple",
|
||||||
"Simple options",
|
"Simple options",
|
||||||
"Show Simple options",
|
"Show Simple options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -57,16 +57,16 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_time_get_option_group (void)
|
mmcli_modem_time_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
group = g_option_group_new ("time",
|
group = g_option_group_new ("time",
|
||||||
"Time options",
|
"Time options",
|
||||||
"Show Time options",
|
"Show Time options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -135,17 +135,17 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_modem_get_option_group (void)
|
mmcli_modem_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
/* Status options */
|
/* Status options */
|
||||||
group = g_option_group_new ("modem",
|
group = g_option_group_new ("modem",
|
||||||
"Modem options",
|
"Modem options",
|
||||||
"Show modem options",
|
"Show modem options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -78,17 +78,17 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_sim_get_option_group (void)
|
mmcli_sim_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
/* Status options */
|
/* Status options */
|
||||||
group = g_option_group_new ("sim",
|
group = g_option_group_new ("sim",
|
||||||
"SIM options",
|
"SIM options",
|
||||||
"Show SIM options",
|
"Show SIM options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@@ -73,17 +73,17 @@ static GOptionEntry entries[] = {
|
|||||||
GOptionGroup *
|
GOptionGroup *
|
||||||
mmcli_sms_get_option_group (void)
|
mmcli_sms_get_option_group (void)
|
||||||
{
|
{
|
||||||
GOptionGroup *group;
|
GOptionGroup *group;
|
||||||
|
|
||||||
/* Status options */
|
/* Status options */
|
||||||
group = g_option_group_new ("sms",
|
group = g_option_group_new ("sms",
|
||||||
"SMS options",
|
"SMS options",
|
||||||
"Show SMS options",
|
"Show SMS options",
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_option_group_add_entries (group, entries);
|
g_option_group_add_entries (group, entries);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
96
cli/mmcli.c
96
cli/mmcli.c
@@ -96,32 +96,32 @@ log_handler (const gchar *log_domain,
|
|||||||
gpointer user_data)
|
gpointer user_data)
|
||||||
{
|
{
|
||||||
const gchar *log_level_str;
|
const gchar *log_level_str;
|
||||||
time_t now;
|
time_t now;
|
||||||
gchar time_str[64];
|
gchar time_str[64];
|
||||||
struct tm *local_time;
|
struct tm *local_time;
|
||||||
|
|
||||||
now = time ((time_t *) NULL);
|
now = time ((time_t *) NULL);
|
||||||
local_time = localtime (&now);
|
local_time = localtime (&now);
|
||||||
strftime (time_str, 64, "%d %b %Y, %H:%M:%S", local_time);
|
strftime (time_str, 64, "%d %b %Y, %H:%M:%S", local_time);
|
||||||
|
|
||||||
switch (log_level) {
|
switch (log_level) {
|
||||||
case G_LOG_LEVEL_WARNING:
|
case G_LOG_LEVEL_WARNING:
|
||||||
log_level_str = "-Warning **";
|
log_level_str = "-Warning **";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case G_LOG_LEVEL_CRITICAL:
|
case G_LOG_LEVEL_CRITICAL:
|
||||||
case G_LOG_FLAG_FATAL:
|
case G_LOG_FLAG_FATAL:
|
||||||
case G_LOG_LEVEL_ERROR:
|
case G_LOG_LEVEL_ERROR:
|
||||||
log_level_str = "-Error **";
|
log_level_str = "-Error **";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case G_LOG_LEVEL_DEBUG:
|
case G_LOG_LEVEL_DEBUG:
|
||||||
log_level_str = "[Debug]";
|
log_level_str = "[Debug]";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
log_level_str = "";
|
log_level_str = "";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
g_print ("[%s] %s %s\n", time_str, log_level_str, message);
|
g_print ("[%s] %s %s\n", time_str, log_level_str, message);
|
||||||
@@ -188,39 +188,39 @@ main (gint argc, gchar **argv)
|
|||||||
|
|
||||||
/* Setup option context, process it and destroy it */
|
/* Setup option context, process it and destroy it */
|
||||||
context = g_option_context_new ("- Control and monitor the ModemManager");
|
context = g_option_context_new ("- Control and monitor the ModemManager");
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_manager_get_option_group ());
|
mmcli_manager_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_get_common_option_group ());
|
mmcli_get_common_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_get_option_group ());
|
mmcli_modem_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_3gpp_get_option_group ());
|
mmcli_modem_3gpp_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_cdma_get_option_group ());
|
mmcli_modem_cdma_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_simple_get_option_group ());
|
mmcli_modem_simple_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_location_get_option_group ());
|
mmcli_modem_location_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_messaging_get_option_group ());
|
mmcli_modem_messaging_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_time_get_option_group ());
|
mmcli_modem_time_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_firmware_get_option_group ());
|
mmcli_modem_firmware_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_signal_get_option_group ());
|
mmcli_modem_signal_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_modem_oma_get_option_group ());
|
mmcli_modem_oma_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_sim_get_option_group ());
|
mmcli_sim_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_bearer_get_option_group ());
|
mmcli_bearer_get_option_group ());
|
||||||
g_option_context_add_group (context,
|
g_option_context_add_group (context,
|
||||||
mmcli_sms_get_option_group ());
|
mmcli_sms_get_option_group ());
|
||||||
g_option_context_add_main_entries (context, main_entries, NULL);
|
g_option_context_add_main_entries (context, main_entries, NULL);
|
||||||
g_option_context_parse (context, &argc, &argv, NULL);
|
g_option_context_parse (context, &argc, &argv, NULL);
|
||||||
g_option_context_free (context);
|
g_option_context_free (context);
|
||||||
|
|
||||||
if (version_flag)
|
if (version_flag)
|
||||||
print_version_and_exit ();
|
print_version_and_exit ();
|
||||||
|
Reference in New Issue
Block a user