summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/dirpart.c2
-rw-r--r--src/fat_unformat.c9
-rw-r--r--src/file_gz.c2
3 files changed, 6 insertions, 7 deletions
diff --git a/src/dirpart.c b/src/dirpart.c
index 1aad918..7ea1706 100644
--- a/src/dirpart.c
+++ b/src/dirpart.c
@@ -169,7 +169,7 @@ int dir_partition(disk_t *disk_car, const partition_t *partition, const int verb
{
file_data_t *dir_list;
dir_list=dir_data.get_dir(disk_car, partition, &dir_data, dir_data.current_inode);
- dir_aff_log(disk_car, partition, &dir_data, dir_list);
+ dir_aff_log(&dir_data, dir_list);
delete_list_file(dir_list);
}
#endif
diff --git a/src/fat_unformat.c b/src/fat_unformat.c
index c63715b..b060249 100644
--- a/src/fat_unformat.c
+++ b/src/fat_unformat.c
@@ -35,14 +35,11 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
-#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
-#endif
#include "dir.h"
#include "fat_dir.h"
#include "list.h"
@@ -127,10 +124,10 @@ static int fat_copy_file(disk_t *disk, const partition_t *partition, const unsig
{
char *new_file;
FILE *f_out;
- unsigned char *buffer_file=(unsigned char *)MALLOC(block_size);
unsigned int cluster;
unsigned int file_size=file->stat.st_size;
unsigned long int no_of_cluster;
+ unsigned char *buffer_file=(unsigned char *)MALLOC(block_size);
cluster = file->stat.st_ino;
new_file=(char *)MALLOC(1024);
snprintf(new_file, 1024, "%s.%u/f%u-%s", recup_dir, dir_num,
@@ -213,6 +210,8 @@ static int fat_unformat_aux(disk_t *disk, partition_t *partition, const int verb
if(dir_list!=NULL)
{
const file_data_t *current_file;
+ log_info("Sector %llu\n", (long long unsigned)old_offset/disk->sector_size);
+ dir_aff_log(NULL, dir_list);
del_search_space(list_search_space, old_offset, old_offset + blocksize -1);
current_file=dir_list;
while(current_file!=NULL)
diff --git a/src/file_gz.c b/src/file_gz.c
index 0b694e7..157774d 100644
--- a/src/file_gz.c
+++ b/src/file_gz.c
@@ -118,7 +118,7 @@ static int header_check_gz(const unsigned char *buffer, const unsigned int buffe
const unsigned char *buffer_compr=buffer+off;
unsigned char buffer_uncompr[512];
const unsigned int comprLen=(buffer_size<512?buffer_size:512)-off;
- unsigned int uncomprLen=512-1;
+ const unsigned int uncomprLen=512-1;
z_stream d_stream; /* decompression stream */
d_stream.zalloc = (alloc_func)0;
d_stream.zfree = (free_func)0;