From 2bebe565584ab141d681f95b2c7c1e77bcf8a753 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 9 Sep 2024 15:57:51 +0600 Subject: [PATCH] Test removal of saving parameters for tests --- source/ubinstall-gtk.c | 124 ++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index ddebd1f..c26944b 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -90,25 +90,25 @@ void _yon_saving_threaded(char *final_command){ file_return = yon_char_parsed_append(file_return,&file_save,final_command); char *result = yon_char_parsed_to_string(file_return,file_save,""); yon_debug_output("%s\n",result); - yon_char_parsed_free(file_return,file_save); - free(result); + // yon_char_parsed_free(file_return,file_save); + // free(result); } char *yon_save_command_prepare(char *command, char *target){ int size; config_str parsed = yon_char_parse(command,&size," "); - free(parsed[2]); + // free(parsed[2]); parsed[2]=yon_char_new(target); - free(parsed[3]); + // free(parsed[3]); parsed[3]=yon_char_new("set"); for (int i=5;iAvailableLanguagesEntry),chosen_langs); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck),1); - free(chosen_langs); + // free(chosen_langs); } else { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck),0); gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),""); @@ -362,9 +362,9 @@ void yon_interface_update(main_window *widgets){ } else { gtk_list_store_set(widgets->LanguagesList,&iter,0,0,-1); } - if (cur) free(cur); + // if (cur) free(cur); } - if (langsize) yon_char_parsed_free(lang,langsize); + // if (langsize) yon_char_parsed_free(lang,langsize); // gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter)); } @@ -595,14 +595,14 @@ void on_config_custom_save(GtkWidget *, main_window *widgets){ } } path = yon_char_unite("'",file,"'",NULL); - free(file); + // free(file); gtk_widget_destroy(dialog); } else { gtk_widget_destroy(dialog); return; } yon_save_proceed(path,YON_CONFIG_CUSTOM); - if (path) free(path); + // if (path) free(path); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETED); } @@ -767,7 +767,7 @@ void on_language_window_accept(GtkWidget *,dictionary *dict){ if (yon_char_parsed_check_exist(lang_parsed,size,code)!=-1){ gtk_list_store_set(widgets->LanguagesList,&iter,0,1,-1); char *tmp = yon_char_unite(final,!yon_char_is_empty(final)?";":"",labl,NULL); - if (!yon_char_is_empty(final)) free(final); + // if (!yon_char_is_empty(final)) free(final); final = tmp; } else gtk_list_store_set(widgets->LanguagesList,&iter,0,0,-1); @@ -796,8 +796,8 @@ void on_language_window_accept(GtkWidget *,dictionary *dict){ if (yon_char_is_empty(final)) { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguagesCombo),-1); } - if (final) free(final); - yon_char_parsed_free(parsed,size); + // if (final) free(final); + // yon_char_parsed_free(parsed,size); } else gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),""); @@ -993,13 +993,13 @@ void *on_config_save(void *data){ if (file) fclose(file); char *command = save_config_command(yon_char_parsed_to_string(parameters,size," ")); - yon_char_parsed_free(parameters,size); + // yon_char_parsed_free(parameters,size); yon_debug_output("%s\n","Entered installation"); if (system(yon_debug_output("%s\n",command))){ yon_debug_output("%s\n","Entered installation failed"); g_thread_new("success func",(GThreadFunc)on_install_error,widgets); - free(command); + // free(command); main_config.config_save_thread=NULL; main_config.install_thread=0; main_config.install_complete=1; @@ -1008,7 +1008,7 @@ void *on_config_save(void *data){ return 0; }; yon_debug_output("%s\n","Entered installation success"); - free(command); + // free(command); main_config.install_thread=0; main_config.install_complete=1; yon_debug_output("Install set to: %s\n",yon_char_from_int(main_config.install_complete)); @@ -1055,13 +1055,13 @@ gboolean yon_installation_progress_update(void *data) { gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress), fraction); gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel), yon_char_parsed_to_string(parsed, size, " ")); } - yon_char_parsed_free(parsed, size); + // yon_char_parsed_free(parsed, size); } - free(current_copy); - free(percentage); + // free(current_copy); + // free(percentage); } - yon_char_parsed_free(text, size); + // yon_char_parsed_free(text, size); } if (main_config.install_thread) { @@ -1252,9 +1252,9 @@ void *on_setup_system_configuration(void * data){ char *parameter_string = yon_char_parsed_to_string(all_parameters,size," "); char *command = set_user_config_command(parameter_string); if (system(yon_debug_output("%s\n",command))){}; - yon_char_parsed_free(all_parameters,size); - free(command); - if (parameter_string) free(parameter_string); + // yon_char_parsed_free(all_parameters,size); + // free(command); + // if (parameter_string) free(parameter_string); } g_thread_new("success func",(GThreadFunc)on_install_success,widgets); return NULL; @@ -1268,7 +1268,7 @@ void on_log_closed(GtkWidget *, dictionary *dict){ gtk_widget_set_sensitive(widgets->ReadFullLogButton,1); gtk_widget_set_sensitive(widgets->ReadShortLogButton,1); - free(window->command); + // free(window->command); window->Window=NULL; } @@ -1296,9 +1296,9 @@ void *on_save_system_configuration(void * data){ char *parameter_string = yon_char_parsed_to_string(all_parameters,size," "); char *command = save_additional_config_command(parameter_string); if (system(yon_debug_output("%s\n",command))){}; - yon_char_parsed_free(all_parameters,size); - free(command); - if (parameter_string) free(parameter_string); + // yon_char_parsed_free(all_parameters,size); + // free(command); + // if (parameter_string) free(parameter_string); } return NULL; } @@ -1332,8 +1332,8 @@ gboolean yon_read_log(void *data){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ScrollToEndCheck))){ gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)),gtk_adjustment_get_upper(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)))); } - free(final); - yon_char_parsed_free(parsed,size); + // free(final); + // yon_char_parsed_free(parsed,size); } yon_debug_output("%s\n","Log read"); if (!main_config.install_complete){ @@ -1387,8 +1387,8 @@ void yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree,char yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,mode); yon_config_register(part_parameter,part_parameter_command,cur_section); - if(cur_section) free(cur_section); - if(cur_device) free(cur_device); + // if(cur_section) free(cur_section); + // if(cur_device) free(cur_device); if (!main_config.configure_mode) gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN); else @@ -2012,10 +2012,10 @@ void on_region_changed(GtkComboBox *self, main_window *widgets){ for (int i=0;iZoneCombo),parsed[i],_(parsed[i])); } - if (size) yon_char_parsed_free(parsed,size); + // if (size) yon_char_parsed_free(parsed,size); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0); } - free(active); + // free(active); } void on_locale_changed(GtkWidget *,main_window *); @@ -2204,7 +2204,7 @@ void on_near_installation_device_changed(GtkWidget *self, main_window *widgets){ gtk_list_store_append(widgets->PartitionsList,&iter); gtk_list_store_set(widgets->PartitionsList,&iter,0,json_object_get_string(path),1,json_object_get_string(size),2,free_space_string,3,json_object_get_string(fstype),-1); } - yon_char_parsed_free(parsed,size); + // yon_char_parsed_free(parsed,size); } } @@ -2243,7 +2243,7 @@ void on_same_installation_device_changed(GtkWidget *, main_window *widgets){ gtk_list_store_append(widgets->PartitionsList,&iter); gtk_list_store_set(widgets->PartitionsList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,json_object_get_string(size),4,json_object_get_string(vendor),-1); } - yon_char_parsed_free(parsed,size); + // yon_char_parsed_free(parsed,size); } } @@ -2263,9 +2263,9 @@ void on_exit_accepted(GtkWidget *,dictionary *dict){ } main_config.exit_accepted=1; g_signal_emit_by_name(G_OBJECT(widgets->MainWindow),"delete-event",widgets->MainWindow,NULL); - free(window); - yon_dictionary_free_all(dict,NULL); - free(dict); + // free(window); + // yon_dictionary_free_all(dict,NULL); + // free(dict); gtk_widget_destroy(widgets->MainWindow); } @@ -2552,8 +2552,8 @@ main_window *yon_main_window_complete(){ if (size){ char *licence = yon_char_parsed_to_string(parsed,size,""); gtk_label_set_text(GTK_LABEL(widgets->LicenceLabel),licence); - free(licence); - yon_char_parsed_free(parsed,size); + // free(licence); + // yon_char_parsed_free(parsed,size); } config_str slides = yon_char_parsed_new(&size,slide_repeat_path); @@ -2564,7 +2564,7 @@ main_window *yon_main_window_complete(){ for (int i=1;islides_original[i] = gdk_pixbuf_new_from_resource(slides[i-1],NULL); } - yon_char_parsed_free(slides,size); + // yon_char_parsed_free(slides,size); int width = gdk_pixbuf_get_width(widgets->regions_original); int height = gdk_pixbuf_get_height(widgets->regions_original); widgets->region_height_mult = (float)height/width; @@ -2592,11 +2592,11 @@ main_window *yon_main_window_complete(){ gtk_list_store_append(widgets->LanguagesList,&iter); gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,_(cur[1]),2,cur[0],-1); } - yon_char_parsed_free(cur,cur_size); + // yon_char_parsed_free(cur,cur_size); } - yon_char_parsed_free(parsed,size); + // yon_char_parsed_free(parsed,size); if (lang) - yon_char_parsed_free(lang,langsize); + // yon_char_parsed_free(lang,langsize); parsed = yon_dir_get_contents(zone_path,&size); for (int i=0;iRegionCombo),parsed[i],_(parsed[i])); } - free(path); + // free(path); } } gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0); - yon_char_parsed_free(parsed,size); + // yon_char_parsed_free(parsed,size); parsed = yon_config_load(get_layouts_command,&size); GtkTreeIter itar; for (int i=0;iLayoutList,&iter,NULL); gtk_tree_store_set(widgets->LayoutList,&iter,0,layout[0],1,_(layout[1]),2,1,-1); - yon_char_parsed_free(layout,layout_size); + // yon_char_parsed_free(layout,layout_size); char *command = get_layouts_local_command(layout_id); config_str layout_local = yon_config_load(command,&layout_size); - free(command); - free(layout_id); + // free(command); + // free(layout_id); for (int j=0;jLayoutList,&itar,&iter); gtk_tree_store_set(widgets->LayoutList,&itar,0,layouts_parsed[0],1,_(layouts_parsed[1]),2,1,3,0,-1); - yon_char_parsed_free(layouts_parsed,parsed_size); + // yon_char_parsed_free(layouts_parsed,parsed_size); } } if (layout_size==-1) { gtk_tree_store_set(widgets->LayoutList,&iter,2,1,-1); } - yon_char_parsed_free(layout_local,layout_size); + // yon_char_parsed_free(layout_local,layout_size); } } - yon_char_parsed_free(parsed,size); + // yon_char_parsed_free(parsed,size); { parsed = yon_config_load(get_devices_command,&size); char *string = yon_char_parsed_to_string(parsed,size,""); struct json_object *root; struct json_object *blockdevices; root = json_tokener_parse(string); - free(string); + // free(string); json_object_object_get_ex(root, "blockdevices", &blockdevices); for (long unsigned int i = 0; i < json_object_array_length(blockdevices); i++) { struct json_object *device = json_object_array_get_idx(blockdevices, i); @@ -2664,7 +2664,7 @@ main_window *yon_main_window_complete(){ gtk_list_store_set(widgets->DevicesList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,json_object_get_string(size),4,json_object_get_string(vendor),-1); } - yon_char_parsed_free(parsed,size); + // yon_char_parsed_free(parsed,size); } parsed = yon_resource_open_file(additional_software_path,&size); @@ -2674,10 +2674,10 @@ main_window *yon_main_window_complete(){ if (module_size){ gtk_list_store_append(widgets->AdditionalSoftwareList,&iter); gtk_list_store_set(widgets->AdditionalSoftwareList,&iter,0,1,1,module_parsed[0],3,module_parsed[1],-1); //2,module_parsed[2] - yon_char_parsed_free(module_parsed,module_size); + // yon_char_parsed_free(module_parsed,module_size); } } - if (size) yon_char_parsed_free(parsed,size); + // if (size) yon_char_parsed_free(parsed,size); config_str models = yon_config_load(get_models_command,&size); for (int i=0;iKeyboardModelCombo),models[i],_(models[i+1])); } - if (size) yon_char_parsed_free(models,size); + // if (size) yon_char_parsed_free(models,size); gtk_builder_connect_signals(builder,NULL); yon_load_proceed(YON_CONFIG_DEFAULT); yon_interface_update(widgets); @@ -2776,12 +2776,12 @@ int main(int argc, char *argv[]){ yon_window_config_setup(GTK_WINDOW(widgets->MainWindow)); char *window_config_path = config_path; yon_window_config_load(window_config_path); - free(window_config_path); + // free(window_config_path); GtkCssProvider *css=gtk_css_provider_new(); gtk_css_provider_load_from_resource(css,CssPath); gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), -1); gtk_main(); - free(widgets); + // free(widgets); } \ No newline at end of file