summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ewf.c12
-rw-r--r--src/exfat_dir.c6
-rw-r--r--src/ext2_dir.c20
-rw-r--r--src/fat_dir.c6
-rw-r--r--src/file_als.c2
-rw-r--r--src/file_asm.c2
-rw-r--r--src/file_drw.c2
-rw-r--r--src/file_fh5.c2
-rw-r--r--src/file_frm.c2
-rw-r--r--src/file_hr9.c2
-rw-r--r--src/file_jpg.c20
-rw-r--r--src/file_mfa.c2
-rw-r--r--src/file_mfg.c2
-rw-r--r--src/file_prt.c2
-rw-r--r--src/file_rar.c2
-rw-r--r--src/file_spf.c2
-rw-r--r--src/file_tph.c2
-rw-r--r--src/hdaccess.c12
-rw-r--r--src/hdcache.c12
-rw-r--r--src/io_redir.c8
-rw-r--r--src/ntfs_dir.c4
-rw-r--r--src/ntfs_io.c20
-rw-r--r--src/partgpt.c18
-rw-r--r--src/parthumax.c18
-rw-r--r--src/parti386.c30
-rw-r--r--src/partmac.c24
-rw-r--r--src/partnone.c24
-rw-r--r--src/partsun.c26
-rw-r--r--src/partxbox.c24
29 files changed, 154 insertions, 154 deletions
diff --git a/src/ewf.c b/src/ewf.c
index 7d7c3d6..7bf502c 100644
--- a/src/ewf.c
+++ b/src/ewf.c
@@ -296,13 +296,13 @@ disk_t *fewf_init(const char *device, const int mode)
disk->arch=&arch_none;
disk->device=strdup(device);
disk->data=data;
- disk->description=fewf_description;
- disk->description_short=fewf_description_short;
- disk->pread=fewf_pread;
- disk->pwrite=((data->mode&TESTDISK_O_RDWR)?fewf_pwrite:fewf_nopwrite);
- disk->sync=fewf_sync;
+ disk->description=&fewf_description;
+ disk->description_short=&fewf_description_short;
+ disk->pread=&fewf_pread;
+ disk->pwrite=((data->mode&TESTDISK_O_RDWR)?&fewf_pwrite:&fewf_nopwrite);
+ disk->sync=&fewf_sync;
disk->access_mode=(data->mode&TESTDISK_O_RDWR);
- disk->clean=fewf_clean;
+ disk->clean=&fewf_clean;
#if defined( HAVE_LIBEWF_V2_API ) || defined( LIBEWF_GET_BYTES_PER_SECTOR_HAVE_TWO_ARGUMENTS )
{
uint32_t bytes_per_sector = 0;
diff --git a/src/exfat_dir.c b/src/exfat_dir.c
index 98788e4..83baf9a 100644
--- a/src/exfat_dir.c
+++ b/src/exfat_dir.c
@@ -333,11 +333,11 @@ dir_partition_t dir_partition_exfat_init(disk_t *disk, const partition_t *partit
dir_data->param=FLAG_LIST_DELETED;
dir_data->verbose=verbose;
dir_data->capabilities=CAPA_LIST_DELETED;
- dir_data->copy_file=exfat_copy;
- dir_data->close=dir_partition_exfat_close;
+ dir_data->copy_file=&exfat_copy;
+ dir_data->close=&dir_partition_exfat_close;
dir_data->local_dir=NULL;
dir_data->private_dir_data=ls;
- dir_data->get_dir=exfat_dir;
+ dir_data->get_dir=&exfat_dir;
return DIR_PART_OK;
}
diff --git a/src/ext2_dir.c b/src/ext2_dir.c
index c12fcf5..f3dc4a2 100644
--- a/src/ext2_dir.c
+++ b/src/ext2_dir.c
@@ -74,21 +74,21 @@ static int ext2_copy(disk_t *disk_car, const partition_t *partition, dir_data_t
static struct struct_io_manager my_struct_manager = {
.magic = EXT2_ET_MAGIC_IO_MANAGER,
.name ="TestDisk I/O Manager",
- .open = my_open,
- .close = my_close,
- .set_blksize = my_set_blksize,
- .read_blk = my_read_blk,
- .write_blk= my_write_blk,
- .flush = my_flush,
+ .open = &my_open,
+ .close = &my_close,
+ .set_blksize = &my_set_blksize,
+ .read_blk = &my_read_blk,
+ .write_blk= &my_write_blk,
+ .flush = &my_flush,
.write_byte= NULL,
#ifdef HAVE_STRUCT_STRUCT_IO_MANAGER_SET_OPTION
.set_option= NULL,
#endif
#ifdef HAVE_STRUCT_STRUCT_IO_MANAGER_READ_BLK64
- .read_blk64=my_read_blk64,
+ .read_blk64=&my_read_blk64,
#endif
#ifdef HAVE_STRUCT_STRUCT_IO_MANAGER_WRITE_BLK64
- .write_blk64=my_write_blk64,
+ .write_blk64=&my_write_blk64,
#endif
};
static int ext2_dir(disk_t *disk_car, const partition_t *partition, dir_data_t *dir_data, const unsigned long int cluster, file_info_t *dir_list);
@@ -379,8 +379,8 @@ dir_partition_t dir_partition_ext2_init(disk_t *disk_car, const partition_t *par
dir_data->param=FLAG_LIST_DELETED;
dir_data->verbose=verbose;
dir_data->capabilities=CAPA_LIST_DELETED;
- dir_data->get_dir=ext2_dir;
- dir_data->copy_file=ext2_copy;
+ dir_data->get_dir=&ext2_dir;
+ dir_data->copy_file=&ext2_copy;
dir_data->close=&dir_partition_ext2_close;
dir_data->local_dir=NULL;
dir_data->private_dir_data=ls;
diff --git a/src/fat_dir.c b/src/fat_dir.c
index 069b581..3c9c171 100644
--- a/src/fat_dir.c
+++ b/src/fat_dir.c
@@ -468,11 +468,11 @@ dir_partition_t dir_partition_fat_init(disk_t *disk_car, const partition_t *part
dir_data->param|=FLAG_LIST_MASK16;
dir_data->verbose=verbose;
dir_data->capabilities=CAPA_LIST_DELETED;
- dir_data->copy_file=fat_copy;
- dir_data->close=dir_partition_fat_close;
+ dir_data->copy_file=&fat_copy;
+ dir_data->close=&dir_partition_fat_close;
dir_data->local_dir=NULL;
dir_data->private_dir_data=ls;
- dir_data->get_dir=fat_dir;
+ dir_data->get_dir=&fat_dir;
return DIR_PART_OK;
}
diff --git a/src/file_als.c b/src/file_als.c
index 0304b93..5082331 100644
--- a/src/file_als.c
+++ b/src/file_als.c
@@ -61,7 +61,7 @@ static int header_check_als(const unsigned char *buffer, const unsigned int buff
return 0;
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_als.extension;
- file_recovery_new->file_check=file_check_als;
+ file_recovery_new->file_check=&file_check_als;
return 1;
}
diff --git a/src/file_asm.c b/src/file_asm.c
index 7d152b0..6026c74 100644
--- a/src/file_asm.c
+++ b/src/file_asm.c
@@ -59,7 +59,7 @@ static int header_check_asm(const unsigned char *buffer, const unsigned int buff
if(!isprint(buffer[16]) || !isprint(buffer[17]) || !isprint(buffer[18]) || !isprint(buffer[19]))
return 0;
reset_file_recovery(file_recovery_new);
- file_recovery_new->file_check=file_check_asm;
+ file_recovery_new->file_check=&file_check_asm;
file_recovery_new->extension=file_hint_asm.extension;
return 1;
}
diff --git a/src/file_drw.c b/src/file_drw.c
index cbde279..05c9924 100644
--- a/src/file_drw.c
+++ b/src/file_drw.c
@@ -55,7 +55,7 @@ static int header_check_drw(const unsigned char *buffer, const unsigned int buff
if(!isprint(buffer[14]) || !isprint(buffer[15]) || !isprint(buffer[16]) || !isprint(buffer[17]))
return 0;
reset_file_recovery(file_recovery_new);
- file_recovery_new->file_check=file_check_drw;
+ file_recovery_new->file_check=&file_check_drw;
file_recovery_new->extension=file_hint_drw.extension;
return 1;
}
diff --git a/src/file_fh5.c b/src/file_fh5.c
index c322694..63a39f0 100644
--- a/src/file_fh5.c
+++ b/src/file_fh5.c
@@ -67,7 +67,7 @@ static int header_check_fh5(const unsigned char *buffer, const unsigned int buff
file_recovery_new->min_filesize=4096;
file_recovery_new->calculated_file_size=be32(fh5_buffer->datalen);
file_recovery_new->extension=file_hint_fh5.extension;
- file_recovery_new->file_check=file_check_fh5;
+ file_recovery_new->file_check=&file_check_fh5;
// log_debug("header_check_fh5: Guessed length : %u\n", fh5_file_size);
return 1;
}
diff --git a/src/file_frm.c b/src/file_frm.c
index 3f331d4..4b3f126 100644
--- a/src/file_frm.c
+++ b/src/file_frm.c
@@ -58,7 +58,7 @@ static int header_check_frm(const unsigned char *buffer, const unsigned int buff
if(!isprint(buffer[14]) || !isprint(buffer[15]) || !isprint(buffer[16]) || !isprint(buffer[17]))
return 0;
reset_file_recovery(file_recovery_new);
- file_recovery_new->file_check=file_check_frm;
+ file_recovery_new->file_check=&file_check_frm;
file_recovery_new->extension=file_hint_frm.extension;
return 1;
}
diff --git a/src/file_hr9.c b/src/file_hr9.c
index 08f5bf3..3f5045f 100644
--- a/src/file_hr9.c
+++ b/src/file_hr9.c
@@ -50,7 +50,7 @@ static int header_check_hr9(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_hr9.extension;
- file_recovery_new->file_check=file_check_hr9;
+ file_recovery_new->file_check=&file_check_hr9;
return 1;
}
diff --git a/src/file_jpg.c b/src/file_jpg.c
index 518beff..0dc6c8b 100644
--- a/src/file_jpg.c
+++ b/src/file_jpg.c
@@ -768,11 +768,11 @@ static void jpeg_testdisk_src (j_decompress_ptr cinfo, FILE * infile, uint64_t o
}
src = (my_source_mgr *) cinfo->src;
- src->pub.init_source = jpg_init_source;
- src->pub.fill_input_buffer = jpg_fill_input_buffer;
- src->pub.skip_input_data = jpg_skip_input_data;
- src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
- src->pub.term_source = jpg_term_source;
+ src->pub.init_source = &jpg_init_source;
+ src->pub.fill_input_buffer = &jpg_fill_input_buffer;
+ src->pub.skip_input_data = &jpg_skip_input_data;
+ src->pub.resync_to_restart = &jpeg_resync_to_restart; /* use default method */
+ src->pub.term_source = &jpg_term_source;
src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
src->pub.next_input_byte = NULL; /* until buffer loaded */
src->infile = infile;
@@ -873,8 +873,8 @@ static uint64_t jpg_xy_to_offset(FILE *infile, const unsigned int x, const unsig
x, y, (long unsigned)offset_rel1, (long unsigned)offset_rel2);
#endif
jpeg_session.cinfo.err = jpeg_std_error(&jerr.pub);
- jerr.pub.output_message = my_output_message;
- jerr.pub.error_exit = my_error_exit;
+ jerr.pub.output_message = &my_output_message;
+ jerr.pub.error_exit = &my_error_exit;
/* Establish the setjmp return context for my_error_exit to use. */
if (setjmp(jerr.setjmp_buffer))
{
@@ -1147,9 +1147,9 @@ static uint64_t jpg_check_thumb(FILE *infile, const uint64_t offset, const unsig
jpeg_session.offset=offset;
jpeg_session.blocksize=blocksize;
jpeg_session.cinfo.err = jpeg_std_error(&jerr.pub);
- jerr.pub.output_message = my_output_message;
- jerr.pub.error_exit = my_error_exit;
- jerr.pub.emit_message= my_emit_message;
+ jerr.pub.output_message = &my_output_message;
+ jerr.pub.error_exit = &my_error_exit;
+ jerr.pub.emit_message= &my_emit_message;
#ifdef DEBUG_JPEG
jerr.pub.trace_level= 3;
#endif
diff --git a/src/file_mfa.c b/src/file_mfa.c
index 8915ca5..0d9d1a4 100644
--- a/src/file_mfa.c
+++ b/src/file_mfa.c
@@ -49,7 +49,7 @@ static void file_check_mfa(file_recovery_t *file_recovery)
static int header_check_mfa(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)
{
reset_file_recovery(file_recovery_new);
- file_recovery_new->file_check=file_check_mfa;
+ file_recovery_new->file_check=&file_check_mfa;
file_recovery_new->extension=file_hint_mfa.extension;
return 1;
}
diff --git a/src/file_mfg.c b/src/file_mfg.c
index 2c5e892..6c2aca2 100644
--- a/src/file_mfg.c
+++ b/src/file_mfg.c
@@ -52,7 +52,7 @@ static void file_check_mfg(file_recovery_t *file_recovery)
static int header_check_mfg(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)
{
reset_file_recovery(file_recovery_new);
- file_recovery_new->file_check=file_check_mfg;
+ file_recovery_new->file_check=&file_check_mfg;
file_recovery_new->extension=file_hint_mfg.extension;
return 1;
}
diff --git a/src/file_prt.c b/src/file_prt.c
index 59ccc5e..18b45f4 100644
--- a/src/file_prt.c
+++ b/src/file_prt.c
@@ -52,7 +52,7 @@ static void file_check_prt(file_recovery_t *file_recovery)
static int header_check_prt(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)
{
reset_file_recovery(file_recovery_new);
- file_recovery_new->file_check=file_check_prt;
+ file_recovery_new->file_check=&file_check_prt;
file_recovery_new->extension=file_hint_prt.extension;
return 1;
}
diff --git a/src/file_rar.c b/src/file_rar.c
index 730b8e0..1689f9c 100644
--- a/src/file_rar.c
+++ b/src/file_rar.c
@@ -57,7 +57,7 @@ static int header_check_rar(const unsigned char *buffer, const unsigned int buff
reset_file_recovery(file_recovery_new);
file_recovery_new->min_filesize=70;
if((buffer[0xa] & MHD_PASSWORD)==0)
- file_recovery_new->file_check=file_check_rar;
+ file_recovery_new->file_check=&file_check_rar;
file_recovery_new->extension=file_hint_rar.extension;
return 1;
}
diff --git a/src/file_spf.c b/src/file_spf.c
index 65b239f..c235082 100644
--- a/src/file_spf.c
+++ b/src/file_spf.c
@@ -87,7 +87,7 @@ static int header_check_spf(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_spf.extension;
- file_recovery_new->file_check=file_check_spf;
+ file_recovery_new->file_check=&file_check_spf;
return 1;
}
diff --git a/src/file_tph.c b/src/file_tph.c
index 36a7da3..d8ad62b 100644
--- a/src/file_tph.c
+++ b/src/file_tph.c
@@ -58,7 +58,7 @@ static int header_check_tph(const unsigned char *buffer, const unsigned int buff
if(!isprint(buffer[20]) || !isprint(buffer[21]) || !isprint(buffer[22]) || !isprint(buffer[23]))
return 0;
reset_file_recovery(file_recovery_new);
- file_recovery_new->file_check=file_check_tph;
+ file_recovery_new->file_check=&file_check_tph;
file_recovery_new->extension=file_hint_tph.extension;
return 1;
}
diff --git a/src/hdaccess.c b/src/hdaccess.c
index a466778..fa6e1f0 100644
--- a/src/hdaccess.c
+++ b/src/hdaccess.c
@@ -1531,17 +1531,17 @@ disk_t *file_test_availability(const char *device, const int verbose, int testdi
data->handle=hd_h;
data->mode=mode;
disk_car->data=data;
- disk_car->description=file_description;
- disk_car->description_short=file_description_short;
- disk_car->pread=file_pread;
- disk_car->pwrite=((mode&O_RDWR)==O_RDWR?file_pwrite:file_nopwrite);
- disk_car->sync=file_sync;
+ disk_car->description=&file_description;
+ disk_car->description_short=&file_description_short;
+ disk_car->pread=&file_pread;
+ disk_car->pwrite=((mode&O_RDWR)==O_RDWR?&file_pwrite:&file_nopwrite);
+ disk_car->sync=&file_sync;
disk_car->access_mode=((mode&O_RDWR)==O_RDWR?TESTDISK_O_RDWR:TESTDISK_O_RDONLY);
#ifdef O_DIRECT
if((mode&O_DIRECT)==O_DIRECT)
disk_car->access_mode|=TESTDISK_O_DIRECT;
#endif
- disk_car->clean=file_clean;
+ disk_car->clean=&file_clean;
if(fstat(hd_h,&stat_rec)>=0)
{
if(S_ISREG(stat_rec.st_mode) && stat_rec.st_size > 0)
diff --git a/src/hdcache.c b/src/hdcache.c
index 0c4e5a6..c7ae0ab 100644
--- a/src/hdcache.c
+++ b/src/hdcache.c
@@ -264,12 +264,12 @@ disk_t *new_diskcache(disk_t *disk_car, const unsigned int testdisk_mode)
new_disk_car->disk_real_size=disk_car->disk_real_size;
new_disk_car->write_used=0;
new_disk_car->data=data;
- new_disk_car->pread=cache_pread;
- new_disk_car->pwrite=cache_pwrite;
- new_disk_car->sync=cache_sync;
- new_disk_car->clean=cache_clean;
- new_disk_car->description=cache_description;
- new_disk_car->description_short=cache_description_short;
+ new_disk_car->pread=&cache_pread;
+ new_disk_car->pwrite=&cache_pwrite;
+ new_disk_car->sync=&cache_sync;
+ new_disk_car->clean=&cache_clean;
+ new_disk_car->description=&cache_description;
+ new_disk_car->description_short=&cache_description_short;
new_disk_car->rbuffer=NULL;
new_disk_car->wbuffer=NULL;
new_disk_car->rbuffer_size=0;
diff --git a/src/io_redir.c b/src/io_redir.c
index be40cdb..2e34562 100644
--- a/src/io_redir.c
+++ b/src/io_redir.c
@@ -60,7 +60,7 @@ static void io_redir_clean(disk_t *clean);
int io_redir_add_redir(disk_t *disk_car, const uint64_t org_offset, const unsigned int size, const uint64_t new_offset, const void *mem)
{
- if(disk_car->pread!=io_redir_pread)
+ if(disk_car->pread!=&io_redir_pread)
{
struct info_io_redir*data=(struct info_io_redir*)MALLOC(sizeof(*data));
disk_t *old_disk_car=(disk_t *)MALLOC(sizeof(*old_disk_car));
@@ -78,8 +78,8 @@ int io_redir_add_redir(disk_t *disk_car, const uint64_t org_offset, const unsign
disk_car->data=data;
disk_car->description=old_disk_car->description;
disk_car->pwrite=old_disk_car->pwrite;
- disk_car->pread=io_redir_pread;
- disk_car->clean=io_redir_clean;
+ disk_car->pread=&io_redir_pread;
+ disk_car->clean=&io_redir_clean;
}
{
struct info_io_redir *data=(struct info_io_redir *)disk_car->data;
@@ -114,7 +114,7 @@ int io_redir_add_redir(disk_t *disk_car, const uint64_t org_offset, const unsign
int io_redir_del_redir(disk_t *disk_car, uint64_t org_offset)
{
- if(disk_car->pread!=io_redir_pread)
+ if(disk_car->pread!=&io_redir_pread)
{
log_critical("io_redir_del_redir: BUG, no redirection present.\n");
return 1;
diff --git a/src/ntfs_dir.c b/src/ntfs_dir.c
index 6c2869b..43cc55a 100644
--- a/src/ntfs_dir.c
+++ b/src/ntfs_dir.c
@@ -525,8 +525,8 @@ dir_partition_t dir_partition_ntfs_init(disk_t *disk_car, const partition_t *par
dir_data->param=FLAG_LIST_ADS;
dir_data->verbose=verbose;
dir_data->capabilities=CAPA_LIST_ADS;
- dir_data->get_dir=ntfs_dir;
- dir_data->copy_file=ntfs_copy;
+ dir_data->get_dir=&ntfs_dir;
+ dir_data->copy_file=&ntfs_copy;
dir_data->close=&dir_partition_ntfs_close;
dir_data->local_dir=NULL;
dir_data->private_dir_data=ls;
diff --git a/src/ntfs_io.c b/src/ntfs_io.c
index 9253ff8..7f57edd 100644
--- a/src/ntfs_io.c
+++ b/src/ntfs_io.c
@@ -168,15 +168,15 @@ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
* Device operations for working with unix style devices and files.
*/
struct ntfs_device_operations ntfs_device_testdisk_io_ops = {
- .open = ntfs_device_testdisk_io_open,
- .close = ntfs_device_testdisk_io_close,
- .seek = ntfs_device_testdisk_io_seek,
- .read = ntfs_device_testdisk_io_read,
- .write = ntfs_device_testdisk_io_write,
- .pread = ntfs_device_testdisk_io_pread,
- .pwrite = ntfs_device_testdisk_io_pwrite,
- .sync = ntfs_device_testdisk_io_sync,
- .stat = ntfs_device_testdisk_io_stat,
- .ioctl = ntfs_device_testdisk_io_ioctl,
+ .open = &ntfs_device_testdisk_io_open,
+ .close = &ntfs_device_testdisk_io_close,
+ .seek = &ntfs_device_testdisk_io_seek,
+ .read = &ntfs_device_testdisk_io_read,
+ .write = &ntfs_device_testdisk_io_write,
+ .pread = &ntfs_device_testdisk_io_pread,
+ .pwrite = &ntfs_device_testdisk_io_pwrite,
+ .sync = &ntfs_device_testdisk_io_sync,
+ .stat = &ntfs_device_testdisk_io_stat,
+ .ioctl = &ntfs_device_testdisk_io_ioctl,
};
#endif
diff --git a/src/partgpt.c b/src/partgpt.c
index 3ca598c..cac4e78 100644
--- a/src/partgpt.c
+++ b/src/partgpt.c
@@ -123,20 +123,20 @@ arch_fnct_t arch_gpt=
.part_name="EFI GPT",
.part_name_option="partition_gpt",
.msg_part_type=" P=Primary D=Deleted",
- .read_part=read_part_gpt,
- .write_part=write_part_gpt,
- .init_part_order=init_part_order_gpt,
+ .read_part=&read_part_gpt,
+ .write_part=&write_part_gpt,
+ .init_part_order=&init_part_order_gpt,
.get_geometry_from_mbr=NULL,
- .check_part=check_part_gpt,
+ .check_part=&check_part_gpt,
.write_MBR_code=NULL,
- .set_prev_status=set_next_status_gpt,
- .set_next_status=set_next_status_gpt,
- .test_structure=test_structure_gpt,
+ .set_prev_status=&set_next_status_gpt,
+ .set_next_status=&set_next_status_gpt,
+ .test_structure=&test_structure_gpt,
.get_part_type=NULL,
.set_part_type=NULL,
- .init_structure=init_structure_gpt,
+ .init_structure=&init_structure_gpt,
.erase_list_part=NULL,
- .get_partition_typename=get_partition_typename_gpt,
+ .get_partition_typename=&get_partition_typename_gpt,
.is_part_known=&is_part_known_gpt
};
diff --git a/src/parthumax.c b/src/parthumax.c
index 63625ec..9b4894e 100644
--- a/src/parthumax.c
+++ b/src/parthumax.c
@@ -77,20 +77,20 @@ arch_fnct_t arch_humax=
.part_name="Humax",
.part_name_option="partition_humax",
.msg_part_type=" P=Primary D=Deleted",
- .read_part=read_part_humax,
- .write_part=write_part_humax,
- .init_part_order=init_part_order_humax,
+ .read_part=&read_part_humax,
+ .write_part=&write_part_humax,
+ .init_part_order=&init_part_order_humax,
.get_geometry_from_mbr=NULL,
.check_part=NULL,
.write_MBR_code=NULL,
- .set_prev_status=set_next_status_humax,
- .set_next_status=set_next_status_humax,
- .test_structure=test_structure_humax,
- .get_part_type=get_part_type_humax,
+ .set_prev_status=&set_next_status_humax,
+ .set_next_status=&set_next_status_humax,
+ .test_structure=&test_structure_humax,
+ .get_part_type=&get_part_type_humax,
.set_part_type=NULL,
- .init_structure=init_structure_humax,
+ .init_structure=&init_structure_humax,
.erase_list_part=NULL,
- .get_partition_typename=get_partition_typename_humax,
+ .get_partition_typename=&get_partition_typename_humax,
.is_part_known=NULL
};
diff --git a/src/parti386.c b/src/parti386.c
index dd4f021..962115e 100644
--- a/src/parti386.c
+++ b/src/parti386.c
@@ -216,21 +216,21 @@ arch_fnct_t arch_i386= {
.part_name="Intel",
.part_name_option="partition_i386",
.msg_part_type="*=Primary bootable P=Primary L=Logical E=Extended D=Deleted",
- .read_part=read_part_i386,
- .write_part=write_part_i386,
- .init_part_order=init_part_order_i386,
- .get_geometry_from_mbr=get_geometry_from_i386mbr,
- .check_part=check_part_i386,
- .write_MBR_code=write_MBR_code_i386,
- .set_prev_status=set_prev_status_i386,
- .set_next_status=set_next_status_i386,
- .test_structure=test_structure_i386,
- .get_part_type=get_part_type_i386,
- .set_part_type=set_part_type_i386,
- .init_structure=init_structure_i386,
- .erase_list_part=erase_list_part_i386,
- .get_partition_typename=get_partition_typename_i386,
- .is_part_known=is_part_known_i386
+ .read_part=&read_part_i386,
+ .write_part=&write_part_i386,
+ .init_part_order=&init_part_order_i386,
+ .get_geometry_from_mbr=&get_geometry_from_i386mbr,
+ .check_part=&check_part_i386,
+ .write_MBR_code=&write_MBR_code_i386,
+ .set_prev_status=&set_prev_status_i386,
+ .set_next_status=&set_next_status_i386,
+ .test_structure=&test_structure_i386,
+ .get_part_type=&get_part_type_i386,
+ .set_part_type=&set_part_type_i386,
+ .init_structure=&init_structure_i386,
+ .erase_list_part=&erase_list_part_i386,
+ .get_partition_typename=&get_partition_typename_i386,
+ .is_part_known=&is_part_known_i386
};
static uint64_t C_H_S2offset(const disk_t *disk_car,const unsigned int C, const unsigned int H, const unsigned int S)
diff --git a/src/partmac.c b/src/partmac.c
index 5fe2053..4f08753 100644
--- a/src/partmac.c
+++ b/src/partmac.c
@@ -84,21 +84,21 @@ arch_fnct_t arch_mac=
.part_name="Mac",
.part_name_option="partition_mac",
.msg_part_type=" P=Primary D=Deleted",
- .read_part=read_part_mac,
- .write_part=write_part_mac,
- .init_part_order=init_part_order_mac,
+ .read_part=&read_part_mac,
+ .write_part=&write_part_mac,
+ .init_part_order=&init_part_order_mac,
.get_geometry_from_mbr=NULL,
- .check_part=check_part_mac,
+ .check_part=&check_part_mac,
.write_MBR_code=NULL,
- .set_prev_status=set_next_status_mac,
- .set_next_status=set_next_status_mac,
- .test_structure=test_structure_mac,
- .get_part_type=get_part_type_mac,
- .set_part_type=set_part_type_mac,
- .init_structure=init_structure_mac,
+ .set_prev_status=&set_next_status_mac,
+ .set_next_status=&set_next_status_mac,
+ .test_structure=&test_structure_mac,
+ .get_part_type=&get_part_type_mac,
+ .set_part_type=&set_part_type_mac,
+ .init_structure=&init_structure_mac,
.erase_list_part=NULL,
- .get_partition_typename=get_partition_typename_mac,
- .is_part_known=is_part_known_mac
+ .get_partition_typename=&get_partition_typename_mac,
+ .is_part_known=&is_part_known_mac
};
static unsigned int get_part_type_mac(const partition_t *partition)
diff --git a/src/partnone.c b/src/partnone.c
index f493f3e..ff20954 100644
--- a/src/partnone.c
+++ b/src/partnone.c
@@ -148,21 +148,21 @@ arch_fnct_t arch_none=
.part_name="None",
.part_name_option="partition_none",
.msg_part_type=NULL,
- .read_part=read_part_none,
+ .read_part=&read_part_none,
.write_part=NULL,
- .init_part_order=init_part_order_none,
- .get_geometry_from_mbr=get_geometry_from_nonembr,
- .check_part=check_part_none,
+ .init_part_order=&init_part_order_none,
+ .get_geometry_from_mbr=&get_geometry_from_nonembr,
+ .check_part=&check_part_none,
.write_MBR_code=NULL,
- .set_prev_status=set_next_status_none,
- .set_next_status=set_next_status_none,
- .test_structure=test_structure_none,
- .get_part_type=get_part_type_none,
- .set_part_type=set_part_type_none,
- .init_structure=init_structure_none,
+ .set_prev_status=&set_next_status_none,
+ .set_next_status=&set_next_status_none,
+ .test_structure=&test_structure_none,
+ .get_part_type=&get_part_type_none,
+ .set_part_type=&set_part_type_none,
+ .init_structure=&init_structure_none,
.erase_list_part=NULL,
- .get_partition_typename=get_partition_typename_none,
- .is_part_known=is_part_known_none
+ .get_partition_typename=&get_partition_typename_none,
+ .is_part_known=&is_part_known_none
};
static unsigned int get_part_type_none(const partition_t *partition)
diff --git a/src/partsun.c b/src/partsun.c
index 15afebf..122a64a 100644
--- a/src/partsun.c
+++ b/src/partsun.c
@@ -87,21 +87,21 @@ arch_fnct_t arch_sun=
.part_name="Sun",
.part_name_option="partition_sun",
.msg_part_type=" P=Primary D=Deleted",
- .read_part=read_part_sun,
- .write_part=write_part_sun,
- .init_part_order=init_part_order_sun,
- .get_geometry_from_mbr=get_geometry_from_sunmbr,
- .check_part=check_part_sun,
+ .read_part=&read_part_sun,
+ .write_part=&write_part_sun,
+ .init_part_order=&init_part_order_sun,
+ .get_geometry_from_mbr=&get_geometry_from_sunmbr,
+ .check_part=&check_part_sun,
.write_MBR_code=NULL,
- .set_prev_status=set_next_status_sun,
- .set_next_status=set_next_status_sun,
- .test_structure=test_structure_sun,
- .get_part_type=get_part_type_sun,
- .set_part_type=set_part_type_sun,
- .init_structure=init_structure_sun,
+ .set_prev_status=&set_next_status_sun,
+ .set_next_status=&set_next_status_sun,
+ .test_structure=&test_structure_sun,
+ .get_part_type=&get_part_type_sun,
+ .set_part_type=&set_part_type_sun,
+ .init_structure=&init_structure_sun,
.erase_list_part=NULL,
- .get_partition_typename=get_partition_typename_sun,
- .is_part_known=is_part_known_sun
+ .get_partition_typename=&get_partition_typename_sun,
+ .is_part_known=&is_part_known_sun
};
static unsigned int get_part_type_sun(const partition_t *partition)
diff --git a/src/partxbox.c b/src/partxbox.c
index 5101e0e..c426b99 100644
--- a/src/partxbox.c
+++ b/src/partxbox.c
@@ -68,21 +68,21 @@ arch_fnct_t arch_xbox=
.part_name="XBox",
.part_name_option="partition_xbox",
.msg_part_type=" P=Primary D=Deleted",
- .read_part=read_part_xbox,
- .write_part=write_part_xbox,
- .init_part_order=init_part_order_xbox,
+ .read_part=&read_part_xbox,
+ .write_part=&write_part_xbox,
+ .init_part_order=&init_part_order_xbox,
.get_geometry_from_mbr=NULL,
- .check_part=check_part_xbox,
+ .check_part=&check_part_xbox,
.write_MBR_code=NULL,
- .set_prev_status=set_next_status_xbox,
- .set_next_status=set_next_status_xbox,
- .test_structure=test_structure_xbox,
- .get_part_type=get_part_type_xbox,
- .set_part_type=set_part_type_xbox,
- .init_structure=init_structure_xbox,
+ .set_prev_status=&set_next_status_xbox,
+ .set_next_status=&set_next_status_xbox,
+ .test_structure=&test_structure_xbox,
+ .get_part_type=&get_part_type_xbox,
+ .set_part_type=&set_part_type_xbox,
+ .init_structure=&init_structure_xbox,
.erase_list_part=NULL,
- .get_partition_typename=get_partition_typename_xbox,
- .is_part_known=is_part_known_xbox
+ .get_partition_typename=&get_partition_typename_xbox,
+ .is_part_known=&is_part_known_xbox
};
static unsigned int get_part_type_xbox(const partition_t *partition)