Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-devices.c

Timestamp:

Sep 24, 2007, 3:04:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
Should solve the tmpdir issue from previous rev.
May still not compile

File:

• branches/2.2.5/mondo/src/common/libmondo-devices.c (modified) (11 diffs)

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -276 +276 @@
 extern t_bkptype g_backup_media_type;   // set by main()
 
-
-
-
-void set_g_cdrom_and_g_dvd_to_bkpinfo_value(struct s_bkpinfo *bkpinfo)
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
+
+
+
+void set_g_cdrom_and_g_dvd_to_bkpinfo_value()
 {
     strcpy(g_cdrom_drive_is_here, bkpinfo->media_device);   // just in case
@@ -664 +667 @@
  * @see mount_CDROM_here
  */
-int find_and_mount_actual_cd(struct s_bkpinfo *bkpinfo, char *mountpoint)
+int find_and_mount_actual_cd(char *mountpoint)
 {
     /*@ buffers ***************************************************** */
@@ -1698 +1701 @@
  */
 void
-insist_on_this_cd_number(struct s_bkpinfo *bkpinfo, int cd_number_i_want)
+insist_on_this_cd_number(int cd_number_i_want)
 {
 
@@ -1755 +1758 @@
 //    return;
     }
-    if ((res = what_number_cd_is_this(bkpinfo)) != cd_number_i_want) {
+    if ((res = what_number_cd_is_this()) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
@@ -1765 +1768 @@
                 cd_number_i_want);
         log_msg(3, tmp);
-        while (what_number_cd_is_this(bkpinfo) != cd_number_i_want) {
+        while (what_number_cd_is_this() != cd_number_i_want) {
             paranoid_system("sync");
             if (is_this_device_mounted(MNT_CDROM)) {
@@ -1813 +1816 @@
  * @ingroup archiveGroup
  */
-int interactively_obtain_media_parameters_from_user(struct s_bkpinfo
-                                                    *bkpinfo,
-                                                    bool
-                                                    archiving_to_media)
+int interactively_obtain_media_parameters_from_user(bool archiving_to_media)
 // archiving_to_media is TRUE if I'm being called by mondoarchive
 // archiving_to_media is FALSE if I'm being called by mondorestore
@@ -1852 +1852 @@
             bkptype_to_string(bkpinfo->backup_media_type));
     if (archiving_to_media) {
-        sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+        sensibly_set_tmpdir_and_scratchdir();
     }
     bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
@@ -1932 +1932 @@
                 sprintf(comment,
                         "Please specify your %s drive's /dev entry",
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type));
+                        media_descriptor_string(bkpinfo->backup_media_type));
                 if (!popup_and_get_string
                     ("Device?", comment, bkpinfo->media_device,
@@ -1951 +1950 @@
                 sprintf(tmp,
                         "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                        media_descriptor_string(bkpinfo->backup_media_type),
                         bkpinfo->media_device);
                 if (!ask_me_yes_or_no(tmp)) {
@@ -2507 +2505 @@
  * @ingroup utilityGroup
  */
-void sensibly_set_tmpdir_and_scratchdir(struct s_bkpinfo *bkpinfo)
+void sensibly_set_tmpdir_and_scratchdir()
 {
     char *tmp, *command, *sz;
@@ -2609 +2607 @@
  * (and remain mounted after this function returns).
  */
-int what_number_cd_is_this(struct s_bkpinfo *bkpinfo)
+int what_number_cd_is_this()
 {
     int cd_number = -1;