diff --git a/source/my_device.c b/source/my_device.c index 995306d..a10d499 100644 --- a/source/my_device.c +++ b/source/my_device.c @@ -10,11 +10,10 @@ void device_disk_parsed() { char* cmd = "lsblk --fs --raw --output PATH,FSTYPE --exclude 7,11,253"; int size = 0; char** responce = yon_config_load(cmd, &size); - char* disk = NULL; obj_device_config.size_disk = 0; char* split_simvol = " "; for (int index = 1; index < size; index++ ) { - disk = yon_char_divide_search(responce[index], "\n", -1); + char* disk = yon_char_divide_search(responce[index], "\n", -1); if (yon_char_find_count(disk, " ") != 0) { char* name_disk = yon_char_divide_search(disk, " ", -1); obj_device_config.name_disk = yon_char_parsed_append(obj_device_config.name_disk, &obj_device_config.size_disk, name_disk); @@ -25,29 +24,19 @@ void device_disk_parsed() { obj_device_config.size_disk--; obj_device_config.type_dick = yon_char_parsed_append(obj_device_config.type_dick, &obj_device_config.size_disk, ""); obj_device_config.size_disk--; - char* description_disk = yon_char_unite(name_disk, + disk = yon_char_replace(disk," ", ""); + if (strlen(disk)!=0) { + char* description_disk = yon_char_unite(name_disk, split_simvol, disk, NULL); - obj_device_config.description_disk = yon_char_parsed_append(obj_device_config.description_disk, &obj_device_config.size_disk, description_disk); - free(description_disk); + obj_device_config.description_disk = yon_char_parsed_append(obj_device_config.description_disk, &obj_device_config.size_disk, description_disk); + free(description_disk); + + } free(name_disk); } - else { - obj_device_config.name_disk = yon_char_parsed_append(obj_device_config.name_disk, &obj_device_config.size_disk, disk); - obj_device_config.size_disk--; - obj_device_config.file_system = yon_char_parsed_append(obj_device_config.file_system, &obj_device_config.size_disk, ""); - obj_device_config.size_disk--; - obj_device_config.mounted = yon_char_parsed_append(obj_device_config.mounted, &obj_device_config.size_disk, ""); - obj_device_config.size_disk--; - obj_device_config.type_dick = yon_char_parsed_append(obj_device_config.type_dick, &obj_device_config.size_disk, ""); - obj_device_config.size_disk--; - char* description_disk = yon_char_unite(disk, - split_simvol, - NULL); - obj_device_config.description_disk = yon_char_parsed_append(obj_device_config.description_disk, &obj_device_config.size_disk, description_disk); - free(description_disk); - } + free(disk); } } diff --git a/source/ubl-settings-resourcequota.c b/source/ubl-settings-resourcequota.c index 27dd0c9..c089412 100644 --- a/source/ubl-settings-resourcequota.c +++ b/source/ubl-settings-resourcequota.c @@ -458,9 +458,7 @@ void set_pow_size(char* str_find, int** array_size, char*** array_data , int ind index--; } else if (strstr(str_find,"T") != NULL) { - puts(str_find); *array_size = philos_int_append(*array_size, &index, 3); - printf("%d\n\n", (*array_size)[index-1]); str_find = yon_char_divide(str_find, length-1); str_find = yon_char_unite(str_find," ", STR_TB, NULL); diff --git a/source/ubl-utils.c b/source/ubl-utils.c index 040c58c..6d978d7 100644 --- a/source/ubl-utils.c +++ b/source/ubl-utils.c @@ -606,6 +606,7 @@ char *yon_char_replace(char *source, char *find, char*replace){ } return source; } + return source; } void philos_split_size_memory(char* str_value, int* size, char* pow_memory) { // pow_memory = yon_char_new(str_value); diff --git a/source/view_edit.c b/source/view_edit.c index 62bd21f..61b5a11 100644 --- a/source/view_edit.c +++ b/source/view_edit.c @@ -127,7 +127,7 @@ void edit_set_active_widgets_device_io(GtkWidget *self, GtkWidget *entry, GtkWid gtk_widget_set_sensitive(entry, 0); gtk_widget_set_sensitive(label, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self), 0); - gtk_spin_button_set_digits(GTK_SPIN_BUTTON(entry), 0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(entry), 0); }