Attachment 127545 Details for Bug 96855 – Minor fixes

[patch] Minor fixes

minor-fix.patch (text/plain), 3.03 KB, created by Aliaksandr Barouski on 2016-10-25 21:17:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aliaksandr Barouski

Created: 2016-10-25 21:17:19 UTC

Size: 3.03 KB

patch

obsolete

>diff --git a/src/qmicli/qmicli-pdc.c b/src/qmicli/qmicli-pdc.c
>index ef77e30..e82fb36 100644
>--- a/src/qmicli/qmicli-pdc.c
>+++ b/src/qmicli/qmicli-pdc.c
>@@ -262,14 +262,14 @@ print_configs (GArray *configs)
> 
>         current_config = &g_array_index (ctx->config_list, ConfigInfo, i);
> 
>-        g_printf ("Configuration %u:\n", i);
>+        g_printf ("Configuration %u:\n", i + 1);
>         g_printf ("\tDescription: %s\n", current_config->description);
>         g_printf ("\tType:        %s\n", qmi_pdc_configuration_type_get_string (current_config->config_type));
>         g_printf ("\tSize:        %u\n", current_config->total_size);
>         g_printf ("\tStatus:      %s\n", status_string (current_config->id));
>         g_printf ("\tVersion:     0x%X\n", current_config->version);
>         id_str = qmicli_get_raw_data_printable (current_config->id, 80, "");
>-        g_printf ("\tID:          %s\n", id_str ? id_str ? "none");
>+        g_printf ("\tID:          %s\n", id_str ? id_str : "none");
>         g_free (id_str);
>     }
> }
>@@ -462,7 +462,6 @@ list_configs_ready_indication (QmiClientPdc *client,
>         current_info->config_type = element->config_type;
> 
>         input = qmi_message_pdc_get_config_info_input_new ();
>-        g_print ("Fetching config type: %s\n", qmi_pdc_configuration_type_get_string (current_info->config_type));
> 
>         /* Add type with id */
>         type_with_id.config_type = element->config_type;
>@@ -490,7 +489,6 @@ list_configs_ready_indication (QmiClientPdc *client,
>         qmi_message_pdc_get_config_info_input_unref (input);
>     }
> 
>-    g_print ("Loaded configs: %u\n", ctx->config_list->len);
>     check_list_config_completed ();
> }
> 
>@@ -529,7 +527,8 @@ get_selected_config_ready_indication (QmiClientPdc *client,
>         return;
>     }
> 
>-    if (error_code != 0) {
>+    if (error_code != 0 &&
>+        error_code != QMI_PROTOCOL_ERROR_NOT_PROVISIONED) { /*No configs is active */
>         g_printerr ("error: couldn't get selected config: %s\n",
>                     qmi_protocol_error_get_string ((QmiProtocolError) error_code));
>         operation_shutdown (FALSE);
>@@ -1020,7 +1019,7 @@ load_config_input_create_chunk (LoadConfigFileData *config_file)
> 
>     file_content = (guint8 *) g_mapped_file_get_contents (config_file->mapped_file);
>     g_array_append_vals (chunk, &file_content[config_file->offset], chunk_size);
>-    g_print ("Uploaded %lu of %lu\n", config_file->offset, full_size);
>+    g_debug ("Uploaded %lu of %lu\n", config_file->offset, full_size);
> 
>     if (!qmi_message_pdc_load_config_input_set_config_chunk (input,
>                                                              QMI_PDC_CONFIGURATION_TYPE_SOFTWARE,
>@@ -1128,7 +1127,7 @@ load_config_ready_indication (QmiClientPdc *client,
>         return;
>     }
> 
>-    g_print ("Loading next chunk (%u bytes remaining)\n", remaining_size);
>+    g_debug ("Loading next chunk (%u bytes remaining)\n", remaining_size);
>     input = load_config_input_create_chunk (ctx->load_config_file_data);
>     if (!input) {
>         g_printerr ("error: couldn't create next chunk\n");
>

Actions: View | Splinter Review

Attachments on bug 96855: 124953 | 127257 | 127262 | 127544 | 127545

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.