[PATCH] cli: consistently use spaces for indentation
Aleksander Morgado
aleksander at aleksander.es
Tue May 20 00:35:40 PDT 2014
On 20/05/14 08:46, Ben Chan wrote:
> ---
> cli/mmcli-bearer.c | 18 ++++-----
> cli/mmcli-common.c | 18 ++++-----
> cli/mmcli-manager.c | 18 ++++-----
> cli/mmcli-modem-3gpp.c | 16 ++++----
> cli/mmcli-modem-cdma.c | 16 ++++----
> cli/mmcli-modem-firmware.c | 16 ++++----
> cli/mmcli-modem-location.c | 16 ++++----
> cli/mmcli-modem-messaging.c | 16 ++++----
> cli/mmcli-modem-oma.c | 16 ++++----
> cli/mmcli-modem-signal.c | 16 ++++----
> cli/mmcli-modem-simple.c | 16 ++++----
> cli/mmcli-modem-time.c | 16 ++++----
> cli/mmcli-modem.c | 18 ++++-----
> cli/mmcli-sim.c | 18 ++++-----
> cli/mmcli-sms.c | 18 ++++-----
> cli/mmcli.c | 96 ++++++++++++++++++++++-----------------------
> 16 files changed, 174 insertions(+), 174 deletions(-)
>
Pushed, thanks.
> diff --git a/cli/mmcli-bearer.c b/cli/mmcli-bearer.c
> index fef630d..c54ac54 100644
> --- a/cli/mmcli-bearer.c
> +++ b/cli/mmcli-bearer.c
> @@ -63,17 +63,17 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_bearer_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - /* Status options */
> - group = g_option_group_new ("bearer",
> - "Bearer options",
> - "Show bearer options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + /* Status options */
> + group = g_option_group_new ("bearer",
> + "Bearer options",
> + "Show bearer options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-common.c b/cli/mmcli-common.c
> index f7182d5..2d7f66e 100644
> --- a/cli/mmcli-common.c
> +++ b/cli/mmcli-common.c
> @@ -1100,17 +1100,17 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_get_common_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - /* Status options */
> - group = g_option_group_new ("common",
> - "Common options",
> - "Show common options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + /* Status options */
> + group = g_option_group_new ("common",
> + "Common options",
> + "Show common options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> const gchar *
> diff --git a/cli/mmcli-manager.c b/cli/mmcli-manager.c
> index d3bd48e..3278367 100644
> --- a/cli/mmcli-manager.c
> +++ b/cli/mmcli-manager.c
> @@ -71,17 +71,17 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_manager_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - /* Status options */
> - group = g_option_group_new ("manager",
> - "Manager options",
> - "Show manager options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + /* Status options */
> + group = g_option_group_new ("manager",
> + "Manager options",
> + "Show manager options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-3gpp.c b/cli/mmcli-modem-3gpp.c
> index 5b745eb..3c10be2 100644
> --- a/cli/mmcli-modem-3gpp.c
> +++ b/cli/mmcli-modem-3gpp.c
> @@ -89,16 +89,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_3gpp_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("3gpp",
> - "3GPP options",
> - "Show 3GPP related options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("3gpp",
> + "3GPP options",
> + "Show 3GPP related options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-cdma.c b/cli/mmcli-modem-cdma.c
> index 1fc077e..9f669f8 100644
> --- a/cli/mmcli-modem-cdma.c
> +++ b/cli/mmcli-modem-cdma.c
> @@ -67,16 +67,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_cdma_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("cdma",
> - "CDMA options",
> - "Show CDMA related options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("cdma",
> + "CDMA options",
> + "Show CDMA related options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-firmware.c b/cli/mmcli-modem-firmware.c
> index 166c76e..11f4723 100644
> --- a/cli/mmcli-modem-firmware.c
> +++ b/cli/mmcli-modem-firmware.c
> @@ -62,16 +62,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_firmware_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("firmware",
> - "Firmware options",
> - "Show Firmware options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("firmware",
> + "Firmware options",
> + "Show Firmware options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-location.c b/cli/mmcli-modem-location.c
> index caf1bf2..2d54adb 100644
> --- a/cli/mmcli-modem-location.c
> +++ b/cli/mmcli-modem-location.c
> @@ -123,16 +123,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_location_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("location",
> - "Location options",
> - "Show Location options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("location",
> + "Location options",
> + "Show Location options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-messaging.c b/cli/mmcli-modem-messaging.c
> index 381aca1..5d5921f 100644
> --- a/cli/mmcli-modem-messaging.c
> +++ b/cli/mmcli-modem-messaging.c
> @@ -78,16 +78,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_messaging_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("messaging",
> - "Messaging options",
> - "Show Messaging options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("messaging",
> + "Messaging options",
> + "Show Messaging options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-oma.c b/cli/mmcli-modem-oma.c
> index a06eaa3..2e61fe2 100644
> --- a/cli/mmcli-modem-oma.c
> +++ b/cli/mmcli-modem-oma.c
> @@ -83,16 +83,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_oma_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("oma",
> - "OMA options",
> - "Show OMA options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("oma",
> + "OMA options",
> + "Show OMA options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-signal.c b/cli/mmcli-modem-signal.c
> index e1def05..c15b6b5 100644
> --- a/cli/mmcli-modem-signal.c
> +++ b/cli/mmcli-modem-signal.c
> @@ -62,16 +62,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_signal_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("signal",
> - "Signal options",
> - "Show Signal options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("signal",
> + "Signal options",
> + "Show Signal options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-simple.c b/cli/mmcli-modem-simple.c
> index 7b99792..745e538 100644
> --- a/cli/mmcli-modem-simple.c
> +++ b/cli/mmcli-modem-simple.c
> @@ -67,16 +67,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_simple_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("simple",
> - "Simple options",
> - "Show Simple options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("simple",
> + "Simple options",
> + "Show Simple options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem-time.c b/cli/mmcli-modem-time.c
> index 8dde6f4..7c37aaf 100644
> --- a/cli/mmcli-modem-time.c
> +++ b/cli/mmcli-modem-time.c
> @@ -57,16 +57,16 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_time_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - group = g_option_group_new ("time",
> - "Time options",
> - "Show Time options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + group = g_option_group_new ("time",
> + "Time options",
> + "Show Time options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c
> index f4df9fa..f119f6e 100644
> --- a/cli/mmcli-modem.c
> +++ b/cli/mmcli-modem.c
> @@ -135,17 +135,17 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_modem_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - /* Status options */
> - group = g_option_group_new ("modem",
> - "Modem options",
> - "Show modem options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + /* Status options */
> + group = g_option_group_new ("modem",
> + "Modem options",
> + "Show modem options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-sim.c b/cli/mmcli-sim.c
> index 085f335..6599339 100644
> --- a/cli/mmcli-sim.c
> +++ b/cli/mmcli-sim.c
> @@ -78,17 +78,17 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_sim_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - /* Status options */
> - group = g_option_group_new ("sim",
> - "SIM options",
> - "Show SIM options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + /* Status options */
> + group = g_option_group_new ("sim",
> + "SIM options",
> + "Show SIM options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli-sms.c b/cli/mmcli-sms.c
> index c49c8e8..9c54ef7 100644
> --- a/cli/mmcli-sms.c
> +++ b/cli/mmcli-sms.c
> @@ -73,17 +73,17 @@ static GOptionEntry entries[] = {
> GOptionGroup *
> mmcli_sms_get_option_group (void)
> {
> - GOptionGroup *group;
> + GOptionGroup *group;
>
> - /* Status options */
> - group = g_option_group_new ("sms",
> - "SMS options",
> - "Show SMS options",
> - NULL,
> - NULL);
> - g_option_group_add_entries (group, entries);
> + /* Status options */
> + group = g_option_group_new ("sms",
> + "SMS options",
> + "Show SMS options",
> + NULL,
> + NULL);
> + g_option_group_add_entries (group, entries);
>
> - return group;
> + return group;
> }
>
> gboolean
> diff --git a/cli/mmcli.c b/cli/mmcli.c
> index aeb1bd4..a4e6a4f 100644
> --- a/cli/mmcli.c
> +++ b/cli/mmcli.c
> @@ -96,32 +96,32 @@ log_handler (const gchar *log_domain,
> gpointer user_data)
> {
> const gchar *log_level_str;
> - time_t now;
> - gchar time_str[64];
> - struct tm *local_time;
> + time_t now;
> + gchar time_str[64];
> + struct tm *local_time;
>
> - now = time ((time_t *) NULL);
> - local_time = localtime (&now);
> - strftime (time_str, 64, "%d %b %Y, %H:%M:%S", local_time);
> + now = time ((time_t *) NULL);
> + local_time = localtime (&now);
> + strftime (time_str, 64, "%d %b %Y, %H:%M:%S", local_time);
>
> - switch (log_level) {
> - case G_LOG_LEVEL_WARNING:
> - log_level_str = "-Warning **";
> - break;
> + switch (log_level) {
> + case G_LOG_LEVEL_WARNING:
> + log_level_str = "-Warning **";
> + break;
>
> - case G_LOG_LEVEL_CRITICAL:
> + case G_LOG_LEVEL_CRITICAL:
> case G_LOG_FLAG_FATAL:
> - case G_LOG_LEVEL_ERROR:
> - log_level_str = "-Error **";
> - break;
> + case G_LOG_LEVEL_ERROR:
> + log_level_str = "-Error **";
> + break;
>
> - case G_LOG_LEVEL_DEBUG:
> - log_level_str = "[Debug]";
> - break;
> + case G_LOG_LEVEL_DEBUG:
> + log_level_str = "[Debug]";
> + break;
>
> default:
> - log_level_str = "";
> - break;
> + log_level_str = "";
> + break;
> }
>
> 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 */
> context = g_option_context_new ("- Control and monitor the ModemManager");
> - g_option_context_add_group (context,
> - mmcli_manager_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_manager_get_option_group ());
> g_option_context_add_group (context,
> mmcli_get_common_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_3gpp_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_cdma_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_simple_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_location_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_messaging_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_time_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_firmware_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_signal_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_modem_oma_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_sim_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_bearer_get_option_group ());
> - g_option_context_add_group (context,
> - mmcli_sms_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_3gpp_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_cdma_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_simple_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_location_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_messaging_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_time_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_firmware_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_signal_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_modem_oma_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_sim_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_bearer_get_option_group ());
> + g_option_context_add_group (context,
> + mmcli_sms_get_option_group ());
> g_option_context_add_main_entries (context, main_entries, NULL);
> g_option_context_parse (context, &argc, &argv, NULL);
> - g_option_context_free (context);
> + g_option_context_free (context);
>
> if (version_flag)
> print_version_and_exit ();
>
--
Aleksander
https://aleksander.es
More information about the ModemManager-devel
mailing list