Changeset 2770 in MondoRescue

Timestamp:

Apr 21, 2011, 2:14:52 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix compilation issues due to level of visibility of functions

Location:

branches/2.2.9/mondo/src/mondorestore

Files:

• Makefile.am (modified) (1 diff)
• mondo-prep.c (modified) (1 diff)
• mondo-rstr-newt.c (modified) (4 diffs)
• mondo-rstr-newt.h (modified) (1 diff)
• mondo-rstr-tools.c (modified) (1 diff)
• mr-externs.h (modified) (1 diff)

branches/2.2.9/mondo/src/mondorestore/Makefile.am

@@ -14 +14 @@
 sbin_PROGRAMS         = mondorestore
 mondorestore_SOURCES  = mondo-prep.c mondorestore.c mondo-rstr-newt.c \
-                        mondo-rstr-compare.c mondo-rstr-tools.c
+                        mondo-rstr-compare.c mondo-rstr-tools.c ../common/newt-specific.c
 mondorestore_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

@@ -2472 +2472 @@
     long long current_size_of_drive = 0LL;  /* use KB interally for precision */
     long long original_size_of_drive = 0LL; /* use KB interally for precision */
-    long long final_size = 0LL;             /* all in Megabytes */
     struct mountlist_reference *drivemntlist;
 

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -15 +15 @@
 //static char cvsid[] = "$Id$";
 
+extern bool popup_with_buttons(char *p, char *button1, char *button2);
 extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN];
 
@@ -2278 +2279 @@
 bool
 get_isodir_info(char *isodir_device, char *isodir_format,
-                char *isodir_path, bool nuke_me_please)
+                char *isodir_path, char *subdir_path, bool nuke_me_please)
 {
 
     bool HDD = FALSE;
-    char *subdir_path;
     /** initialize ********************************************************/
 
@@ -2313 +2313 @@
              "What is the disk format of the device? (Hit ENTER if you don't know.)",
              isodir_format, 16)) {
-            if (popup_with_button("Are you restoring from an external hard drive ?", "Yes", "No")) {
+            if (popup_with_buttons("Are you restoring from an external hard drive ?", "Yes", "No")) {
                 HDD = TRUE;
             }
@@ -2327 +2327 @@
                     /*  We need an additional param */
                     mr_asprintf(&subdir_path, "%s", isodir_path);
-                    bkpinfo->subdir = subdir_path;
                     strcpy(isodir_path, "/tmp/isodir");
                 }

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -141 +141 @@
 int find_next_free_index_in_disklist(struct list_of_disks *);
 int find_raid_device_in_raidlist(struct raidlist_itself *, char *);
-bool get_isodir_info(char *, char *, char *, bool);
+bool get_isodir_info(char *, char *, char *, char *, bool);
 void initiate_new_raidlist_entry(struct raidlist_itself *,
                                  struct mountlist_itself *, int, char *);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -301 +301 @@
 }
 
-if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, nuke_me_please)) {
+if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, bkpinfo->subdir, nuke_me_please)) {
     return (1);
 }

branches/2.2.9/mondo/src/mondorestore/mr-externs.h

@@ -32 +32 @@
 extern void free_filelist(struct s_node *);
 extern long get_time(void);
-extern bool get_isodir_info(char *, char *, char *, bool);
+extern bool get_isodir_info(char *, char *, char *, char *, bool);
 extern void fatal_error(char *);
 extern void initialize_raid_record(struct raid_device_record *);