Changeset 2770


Ignore:
Timestamp:
Apr 21, 2011, 2:14:52 PM (8 years ago)
Author:
bruno
Message:
  • Fix compilation issues due to level of visibility of functions
Location:
branches/2.2.9/mondo/src/mondorestore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mondo/src/mondorestore/Makefile.am

    r2209 r2770  
    1414sbin_PROGRAMS         = mondorestore
    1515mondorestore_SOURCES  = mondo-prep.c mondorestore.c mondo-rstr-newt.c \
    16                         mondo-rstr-compare.c mondo-rstr-tools.c
     16                        mondo-rstr-compare.c mondo-rstr-tools.c ../common/newt-specific.c
    1717mondorestore_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
  • branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

    r2764 r2770  
    24722472    long long current_size_of_drive = 0LL;  /* use KB interally for precision */
    24732473    long long original_size_of_drive = 0LL; /* use KB interally for precision */
    2474     long long final_size = 0LL;             /* all in Megabytes */
    24752474    struct mountlist_reference *drivemntlist;
    24762475
  • branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

    r2769 r2770  
    1515//static char cvsid[] = "$Id$";
    1616
     17extern bool popup_with_buttons(char *p, char *button1, char *button2);
    1718extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN];
    1819
     
    22782279bool
    22792280get_isodir_info(char *isodir_device, char *isodir_format,
    2280                 char *isodir_path, bool nuke_me_please)
     2281                char *isodir_path, char *subdir_path, bool nuke_me_please)
    22812282{
    22822283
    22832284    bool HDD = FALSE;
    2284     char *subdir_path;
    22852285    /** initialize ********************************************************/
    22862286
     
    23132313             "What is the disk format of the device? (Hit ENTER if you don't know.)",
    23142314             isodir_format, 16)) {
    2315             if (popup_with_button("Are you restoring from an external hard drive ?", "Yes", "No")) {
     2315            if (popup_with_buttons("Are you restoring from an external hard drive ?", "Yes", "No")) {
    23162316                HDD = TRUE;
    23172317            }
     
    23272327                    /*  We need an additional param */
    23282328                    mr_asprintf(&subdir_path, "%s", isodir_path);
    2329                     bkpinfo->subdir = subdir_path;
    23302329                    strcpy(isodir_path, "/tmp/isodir");
    23312330                }
  • branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.h

    r2394 r2770  
    141141int find_next_free_index_in_disklist(struct list_of_disks *);
    142142int find_raid_device_in_raidlist(struct raidlist_itself *, char *);
    143 bool get_isodir_info(char *, char *, char *, bool);
     143bool get_isodir_info(char *, char *, char *, char *, bool);
    144144void initiate_new_raidlist_entry(struct raidlist_itself *,
    145145                                 struct mountlist_itself *, int, char *);
  • branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

    r2769 r2770  
    301301}
    302302
    303 if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, nuke_me_please)) {
     303if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, bkpinfo->subdir, nuke_me_please)) {
    304304    return (1);
    305305}
  • branches/2.2.9/mondo/src/mondorestore/mr-externs.h

    r2394 r2770  
    3232extern void free_filelist(struct s_node *);
    3333extern long get_time(void);
    34 extern bool get_isodir_info(char *, char *, char *, bool);
     34extern bool get_isodir_info(char *, char *, char *, char *, bool);
    3535extern void fatal_error(char *);
    3636extern void initialize_raid_record(struct raid_device_record *);
Note: See TracChangeset for help on using the changeset viewer.