luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add .travis.yml in Makefile.am

Browse source 
Small code style modification
This commit is contained in:
Christophe Grenier 2017-05-19 14:13:24 +02:00
parent 0975413298
commit c849ac047d
6 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -28,7 +28,8 @@ EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README.md README_dev_ph
src/lang/qphotorec.zh_TW.ts \
win/readme.txt win/photorec_win.exe.manifest win/qphotorec_win.exe.manifest \
win/testdisk_win.exe.manifest \
Android.mk jni/Android.mk
Android.mk jni/Android.mk \
.travis.yml
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(docdir)

2
configure.ac
View file

@ -6,7 +6,7 @@ AC_INIT([testdisk],[7.1-WIP],[grenier@cgsecurity.org])
AC_LANG(C)
sinclude(acx_pthread.m4)
sinclude(mkdir.m4)
TESTDISKDATE="April 2017"
TESTDISKDATE="May 2017"
AC_SUBST(TESTDISKDATE)
AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release])
AC_CONFIG_AUX_DIR(config)

4
src/chgarchn.c
View file

@ -53,7 +53,9 @@ int change_arch_type_ncurses(disk_t *disk, const int verbose)
/* arch_list must match the order from menuOptions */
const arch_fnct_t *arch_list[]={&arch_i386, &arch_gpt, &arch_humax, &arch_mac, &arch_none, &arch_sun, &arch_xbox, NULL};
unsigned int menu;
for(menu=0;arch_list[menu]!=NULL && disk->arch!=arch_list[menu];menu++);
for(menu=0;
arch_list[menu]!=NULL && disk->arch!=arch_list[menu];
menu++);
if(arch_list[menu]==NULL)
{
menu=0;

11
src/exfat_dir.c
View file

@ -190,10 +190,15 @@ static int dir_exfat_aux(const unsigned char*buffer, const unsigned int size, co
#ifdef HAVE_ICONV
char *outs;
#endif
unsigned int i,j;
for(j=0; j<255 && current_file->name[j]!='\0'; j++);
unsigned int i;
unsigned int j;
for(j=0;
j<255 && current_file->name[j]!='\0';
j++);
#ifdef HAVE_ICONV
for(i=2; i<32 && (buffer[offset+i]!=0 || buffer[offset+i+1]!=0); i+=2);
for(i=2;
i<32 && (buffer[offset+i]!=0 || buffer[offset+i+1]!=0);
i+=2);
i-=2;
outs=&current_file->name[j];
if(exfat_ucstoutf8(ls->cd, &buffer[offset+2], i, &outs, 512-j) < 0)

4
src/file_3dm.c
View file

@ -44,7 +44,9 @@ const file_hint_t file_hint_3dm= {
static int header_check_3dm(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
{
unsigned int i;
for(i=24; i<buffer_size && buffer[i]==' '; i++);
for(i=24;
i<buffer_size && buffer[i]==' ';
i++);
if(i>=buffer_size || buffer[i]<'0' || buffer[i]>'9')
return 0;
reset_file_recovery(file_recovery_new);

10
src/photorec.c
View file

@ -907,14 +907,20 @@ static inline void file_block_remove_from_sp(alloc_data_t *list_search_space, al
alloc_data_t *tmp;
tmp=td_list_entry(search_walker, alloc_data_t, list);
if(tmp->start <= *offset && *offset + blocksize <= tmp->end + 1)
return file_block_remove_from_sp_aux(tmp, new_current_search_space, offset, blocksize);
{
file_block_remove_from_sp_aux(tmp, new_current_search_space, offset, blocksize);
return;
}
}
td_list_for_each(search_walker, &list_search_space->list)
{
alloc_data_t *tmp;
tmp=td_list_entry(search_walker, alloc_data_t, list);
if(tmp->start <= *offset && *offset + blocksize <= tmp->end + 1)
return file_block_remove_from_sp_aux(tmp, new_current_search_space, offset, blocksize);
{
file_block_remove_from_sp_aux(tmp, new_current_search_space, offset, blocksize);
return ;
}
}
log_critical("file_block_remove_from_sp(list_search_space, alloc_data_t **new_current_search_space, uint64_t *offset, const unsigned int blocksize) failed\n");
}