Справлена грубина пукурсии и json генератор
This commit is contained in:
parent
91a2afb9fb
commit
baa657e486
1 changed files with 8 additions and 8 deletions
16
main.c
16
main.c
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#define bool unsigned char
|
||||
|
||||
#define DEBUG 1
|
||||
#define DEBUG 0
|
||||
|
||||
#if defined(DEBUG) && DEBUG > 1
|
||||
#define DEBUG_PRINT(fmt, args...) fprintf(stderr, "DEBUG: %s:%d:%s(): " fmt, \
|
||||
|
|
@ -362,26 +362,26 @@ cJSON *print_statistik(cJSON *main_Array, struct dir_list_struct* list, char* ou
|
|||
cJSON *content_Array;
|
||||
do{
|
||||
format_size(list->file->size, output, sizeof(output));
|
||||
printf("%s\t%li\t%s\n", output, list->file->size, list->file->name);
|
||||
DEBUG_PRINT("%s\t%li\t%s\n", output, list->file->size, list->file->name);
|
||||
if (js_logok){
|
||||
if (list->file->tipe_dir && (list->file->dir_list != NULL) && (int_depth != i)){
|
||||
DEBUG_PRINT("Рекурсируем!\n");
|
||||
DEBUG_PRINT("Каталог вниз: %s!\n", list->file->name);
|
||||
DEBUG_PRINT("Глубина: %i!\n", i);
|
||||
content_Array = print_statistik(main_Array, list->file->dir_list, output, ++i);
|
||||
printf("AA: %s\n", cJSON_Print(content_Array));
|
||||
cJSON *main_Array_2 = cJSON_CreateArray();
|
||||
content_Array = print_statistik(main_Array_2, list->file->dir_list, output, i + 1);
|
||||
DEBUG_PRINT("AA: %s\n", cJSON_Print(content_Array));
|
||||
DEBUG_PRINT("Верх!\n");
|
||||
}
|
||||
else{
|
||||
DEBUG_PRINT("Конец рекурсии!\n");
|
||||
content_Array = cJSON_CreateArray();
|
||||
|
||||
}
|
||||
DEBUG_PRINT("json_create main_Array!\n");
|
||||
DEBUG_PRINT("Имя: %s!\n", list->file->name);
|
||||
printf("До: %s\n", cJSON_Print(main_Array));
|
||||
DEBUG_PRINT("До: %s\n", cJSON_Print(main_Array));
|
||||
json_create(main_Array, list->file->name, list->file->size, content_Array);
|
||||
printf("После: %s\n", cJSON_Print(main_Array));
|
||||
DEBUG_PRINT("После: %s\n", cJSON_Print(main_Array));
|
||||
|
||||
}
|
||||
DEBUG_PRINT("прыгаем_1!\n");
|
||||
|
|
@ -391,7 +391,7 @@ cJSON *print_statistik(cJSON *main_Array, struct dir_list_struct* list, char* ou
|
|||
return main_Array;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]){ // /home/romenskiy2012/
|
||||
int main(int argc, char *argv[]){
|
||||
char *path;
|
||||
setlocale(LC_ALL, "");
|
||||
//printf("Your locale is: %s\n", setlocale(LC_CTYPE, NULL));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue