Changeset 1647 in MondoRescue for branches/2.2.5/mondo/src/mondorestore


Ignore:
Timestamp:
Sep 24, 2007, 3:24:45 AM (18 years ago)
Author:
Bruno Cornec
Message:

remove bkpinfo also from header files

Location:
branches/2.2.5/mondo/src/mondorestore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/2.2.5/mondo/src/mondorestore/mondo-restore-EXT.h

    r1646 r1647  
    2626
    2727extern void ask_about_these_imagedevs(char *, char *);
    28 extern int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
     28extern int catchall_mode(struct mountlist_itself *,
    2929                         struct raidlist_itself *);
    3030extern void sort_mountlist_by_device(struct mountlist_itself *);
    … …  
    3232                                                                char *,
    3333                                                                char *);
    34 extern int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
     34extern int interactive_mode(struct mountlist_itself *,
    3535                            struct raidlist_itself *);
    36 extern int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *,
     36extern int nuke_mode(struct mountlist_itself *,
    3737                     struct raidlist_itself *);
    38 extern int compare_mode(struct s_bkpinfo *, struct mountlist_itself *,
     38extern int compare_mode(struct mountlist_itself *,
    3939                        struct raidlist_itself *);
    40 extern int iso_mode(struct s_bkpinfo *bkpinfo,
     40extern int iso_mode(
    4141                    struct mountlist_itself *mountlist,
    4242                    struct raidlist_itself *raidlist, bool nuke_me_please);
    4343extern int load_mountlist(struct mountlist_itself *, char *);
    4444extern int load_raidtab_into_raidlist(struct raidlist_itself *, char *);
    45 extern int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
     45extern int restore_mode(struct mountlist_itself *,
    4646                        struct raidlist_itself *);
    4747extern int save_raidlist_to_raidtab(struct raidlist_itself *, char *);
    4848extern void process_raidtab_line(FILE *, struct raid_device_record *,
    4949                                 char *, char *);
    50 extern int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long,
     50extern int restore_a_biggiefile_from_CD(long,
    5151                                        struct s_node *);
    52 extern int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *,
     52extern int restore_a_biggiefile_from_stream(char *,
    5353                                            long, char *, long long,
    5454                                            struct s_node *);
    5555extern int restore_a_tarball_from_CD(char *, int, struct s_node *);
    56 extern int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, int,
     56extern int restore_a_tarball_from_stream(char *, int,
    5757                                         struct s_node *, long long);
    58 extern int restore_all_biggiefiles_from_CD(struct s_bkpinfo *,
     58extern int restore_all_biggiefiles_from_CD(
    5959                                           struct s_node *);
    60 extern int restore_all_biggiefiles_from_stream(struct s_bkpinfo *,
     60extern int restore_all_biggiefiles_from_stream(
    6161                                               struct s_node *);
    62 extern int restore_all_tarballs_from_CD(struct s_bkpinfo *,
     62extern int restore_all_tarballs_from_CD(
    6363                                        struct s_node *);
    64 extern int restore_all_tarballs_from_stream(struct s_bkpinfo *,
     64extern int restore_all_tarballs_from_stream(
    6565                                            struct s_node *);
    66 extern int restore_everything(struct s_bkpinfo *, struct s_node *);
    67 extern int restore_live_from_monitas_server(struct s_bkpinfo *, char *,
     66extern int restore_everything(struct s_node *);
     67extern int restore_live_from_monitas_server(char *,
    6868                                            char *, char *);
    69 extern int restore_to_live_filesystem(struct s_bkpinfo *);
     69extern int restore_to_live_filesystem();
    7070extern void swap_mountlist_entries(struct mountlist_itself *, int, int);
    7171extern void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
    … …  
    7878extern int save_raidlist_to_raidtab(struct raidlist_itself *raidlist,
    7979                                    char *fname);
    80 extern int what_number_cd_is_this(struct s_bkpinfo *);
     80extern int what_number_cd_is_this();
    8181
    8282#ifdef __FreeBSD__

  • branches/2.2.5/mondo/src/mondorestore/mondo-restore.h

    r128 r1647  
    88
    99void ask_about_these_imagedevs(char *, char *);
    10 int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
     10int catchall_mode(struct mountlist_itself *,
    1111                  struct raidlist_itself *);
    1212void find_pathname_of_executable_preferably_in_RESTORING(char *, char *,
    1313                                                         char *);
    14 int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
     14int interactive_mode(struct mountlist_itself *,
    1515                     struct raidlist_itself *);
    16 int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *,
     16int nuke_mode(struct mountlist_itself *,
    1717              struct raidlist_itself *);
    18 int compare_mode(struct s_bkpinfo *, struct mountlist_itself *,
     18int compare_mode(struct mountlist_itself *,
    1919                 struct raidlist_itself *);
    20 int iso_mode(struct s_bkpinfo *bkpinfo, struct mountlist_itself *mountlist,
     20int iso_mode(struct mountlist_itself *mountlist,
    2121             struct raidlist_itself *raidlist, bool nuke_me_please);
    22 int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
     22int restore_mode(struct mountlist_itself *,
    2323                 struct raidlist_itself *);
    24 int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long, struct s_node *,
     24int restore_a_biggiefile_from_CD(long, struct s_node *,
    2525                                 char *);
    26 int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *, long,
     26int restore_a_biggiefile_from_stream(char *, long,
    2727                                     char *, long long, struct s_node *,
    2828                                     int, char *);
    2929int restore_a_tarball_from_CD(char *, long, struct s_node *);
    30 int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, long,
     30int restore_a_tarball_from_stream(char *, long,
    3131                                  struct s_node *, long long, char *,
    3232                                  char *);
    33 int restore_all_biggiefiles_from_CD(struct s_bkpinfo *, struct s_node *);
    34 int restore_all_biggiefiles_from_stream(struct s_bkpinfo *,
     33int restore_all_biggiefiles_from_CD(struct s_node *);
     34int restore_all_biggiefiles_from_stream(
    3535                                        struct s_node *);
    36 int restore_all_tarballs_from_CD(struct s_bkpinfo *, struct s_node *);
    37 int restore_all_tarballs_from_stream(struct s_bkpinfo *, struct s_node *);
    38 int restore_everything(struct s_bkpinfo *, struct s_node *);
    39 int restore_live_from_monitas_server(struct s_bkpinfo *, char *, char *,
     36int restore_all_tarballs_from_CD(struct s_node *);
     37int restore_all_tarballs_from_stream(struct s_node *);
     38int restore_everything(struct s_node *);
     39int restore_live_from_monitas_server(char *, char *,
    4040                                     char *);
    41 int restore_to_live_filesystem(struct s_bkpinfo *);
     41int restore_to_live_filesystem();
    4242void swap_mountlist_entries(struct mountlist_itself *, int, int);
    4343void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
    4444void sort_mountlist_by_device(struct mountlist_itself *);
    45 int what_number_cd_is_this(struct s_bkpinfo *);
     45int what_number_cd_is_this();

  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare-EXT.h

    r128 r1647  
    22
    33
    4 extern int compare_to_CD(struct s_bkpinfo *);
    5 extern int compare_to_cdstream(struct s_bkpinfo *);
    6 extern int compare_to_tape(struct s_bkpinfo *);
    7 extern int compare_mode(struct s_bkpinfo *bkpinfo,
    8                         struct mountlist_itself *mountlist,
     4extern int compare_to_CD();
     5extern int compare_to_cdstream();
     6extern int compare_to_tape();
     7extern int compare_mode(struct mountlist_itself *mountlist,
    98                        struct raidlist_itself *raidlist);

  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare.h

    r128 r1647  
    44
    55
    6 int compare_to_CD(struct s_bkpinfo *);
    7 int compare_to_cdstream(struct s_bkpinfo *);
    8 int compare_to_tape(struct s_bkpinfo *);
     6int compare_to_CD();
     7int compare_to_cdstream();
     8int compare_to_tape();
    99
    1010int
    11 compare_mode(struct s_bkpinfo *bkpinfo,
    12              struct mountlist_itself *mountlist,
     11compare_mode(struct mountlist_itself *mountlist,
    1312             struct raidlist_itself *raidlist);

  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-newt.h

    r1295 r1647  
    5656extern struct s_node *find_node_in_filelist(struct s_node *,
    5757                                            char *filename);
    58 extern int what_number_cd_is_this(struct s_bkpinfo *);
     58extern int what_number_cd_is_this();
    5959//extern void fatal_error (char *);
    6060extern void sort_mountlist_by_device(struct mountlist_itself *);

  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

    r1579 r1647  
    44
    55extern void free_MR_global_filenames();
    6 extern void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
     6extern void get_cfg_file_from_archive_or_bust();
    77extern bool is_file_in_list(char *, char *, char *);    /* needle, haystack, preamble */
    8 extern int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
     8extern int iso_fiddly_bits(bool nuke_me_please);
    99extern void kill_petris(void);
    10 extern int mount_cdrom(struct s_bkpinfo *bkpinfo);
     10extern int mount_cdrom();
    1111extern int mount_all_devices(struct mountlist_itself *, bool);
    1212extern void protect_against_braindead_sysadmins(void);
    1313extern int read_cfg_file_into_bkpinfo(char *cfg_file,
    14                                       struct s_bkpinfo *bkpinfo);
    15 struct s_node *process_filelist_and_biggielist(struct s_bkpinfo *);
     14                                      );
     15struct s_node *process_filelist_and_biggielist();
    1616extern int backup_crucial_file(char *path_root, char *filename);
    1717extern int run_boot_loader(bool);
    … …  
    2424extern void streamline_changes_file(char *, char *);
    2525extern void set_signals(int on);
    26 extern void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo);
     26extern void setup_MR_global_filenames();
    2727//extern void setup_signals(int);
    2828extern void terminate_daemon(int);
    2929extern void termination_in_progress(int);
    3030extern int unmount_all_devices(struct mountlist_itself *);
    31 extern int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo);
     31extern int get_cfg_file_from_archive();
    3232extern int
    33 extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
     33extract_config_file_from_ramdisk(
    3434                                 char *ramdisk_fname,
    3535                                 char *output_cfg_file,

  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.h

    r1579 r1647  
    44
    55void free_global_filenames();
    6 void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
     6void get_cfg_file_from_archive_or_bust();
    77bool is_file_in_list(char *, char *, char *);   /* needle, haystack, preamble */
    8 int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
     8int iso_fiddly_bits(bool nuke_me_please);
    99void kill_petris(void);
    10 int mount_cdrom(struct s_bkpinfo *bkpinfo);
     10int mount_cdrom();
    1111int mount_device(char *, char *, char *, bool);
    1212int mount_all_devices(struct mountlist_itself *, bool);
    1313void protect_against_braindead_sysadmins(void);
    14 int read_cfg_file_into_bkpinfo(char *cfg_file, struct s_bkpinfo *bkpinfo);
    15 struct s_node *process_filelist_and_biggielist(struct s_bkpinfo *);
     14int read_cfg_file_into_bkpinfo(char *cfg_file, );
     15struct s_node *process_filelist_and_biggielist();
    1616int backup_crucial_file(char *path_root, char *filename);
    1717
    … …  
    2424void streamline_changes_file(char *, char *);
    2525void set_signals(int on);
    26 void setup_global_filenames(struct s_bkpinfo *bkpinfo);
     26void setup_global_filenames();
    2727//void setup_signals(int);
    2828void twenty_seconds_til_yikes(void);
    … …  
    3131void termination_in_progress(int);
    3232int unmount_all_devices(struct mountlist_itself *);
    33 int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo);
     33int get_cfg_file_from_archive();
    3434void ask_about_these_imagedevs(char *infname, char *outfname);

  • branches/2.2.5/mondo/src/mondorestore/mr-externs.h

    r684 r1647  
    1616extern bool ask_me_yes_or_no(char *);
    1717extern char *calc_checksum_of_file(char *);
    18 extern int closein_tape(struct s_bkpinfo *);
     18extern int closein_tape();
    1919extern void close_evalcall_form(void);
    2020extern char *call_program_and_get_last_line_of_output(char *);
    … …  
    5151extern void open_evalcall_form(char *);
    5252extern void open_progress_form(char *, char *, char *, char *, long);
    53 extern int openin_cdstream(struct s_bkpinfo *);
    54 extern int openin_tape(struct s_bkpinfo *);
     53extern int openin_cdstream();
     54extern int openin_tape();
    5555extern int partition_device(char *, int, int, char *, long);
    5656extern int partition_device_with_fdisk(char *, int, int, char *, long);
    … …  
    6161extern bool popup_and_get_string(char *, char *, char *, int);
    6262extern void setup_newt_stuff(void);
    63 extern void reset_bkpinfo(struct s_bkpinfo *);
     63extern void reset_bkpinfo();
    6464extern int read_cfg_var(char *, char *, char *);
    65 extern int read_file_from_stream_to_file(struct s_bkpinfo *, char *,
     65extern int read_file_from_stream_to_file(char *,
    6666                                         long long);
    67 extern int read_file_from_stream_to_stream(struct s_bkpinfo *, FILE *,
     67extern int read_file_from_stream_to_stream(FILE *,
    6868                                           long long);
    69 extern int read_file_from_stream_FULL(struct s_bkpinfo *, char *, FILE *,
     69extern int read_file_from_stream_FULL(char *, FILE *,
    7070                                      long long);
    7171extern int read_header_block_from_stream(long long *, char *, int *);
    … …  
    7878extern void update_evalcall_form(int);
    7979extern void update_progress_form(char *);
    80 extern int verify_tape_backups(struct s_bkpinfo *);
     80extern int verify_tape_backups();
    8181extern char which_restore_mode(void);
    8282extern int which_format_command_do_i_need(char *, char *);
    … …  
    9191                                                                mountlist_itself
    9292                                                                *mountlist);
    93 extern int get_cfg_file_from_archive(struct s_bkpinfo *);
     93extern int get_cfg_file_from_archive();
    9494
    9595
Note: See TracChangeset for help on using the changeset viewer.