Changeset 1904 in MondoRescue for branches/stable/mondo/src/common/libmondo-mountlist.c

Timestamp:

Apr 10, 2008, 1:20:42 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1889:1902 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.6

File:

• branches/stable/mondo/src/common/libmondo-mountlist.c (modified) (4 diffs)

branches/stable/mondo/src/common/libmondo-mountlist.c

@@ -847 +847 @@
                mountlist->el[items].mountpoint,
                mountlist->el[items].format,
-               siz, mountlist->el[items].label, mountlist->el[items].uuid);
+               siz, mountlist->el[items].label);
 #elif __FreeBSD__
         sscanf(incoming,
@@ -855 +855 @@
                mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label, "");
-        strcpy(mountlist->el[items].uuid, "");
 #endif
 
@@ -910 +909 @@
                      mountlist->el[items].format,
                      mountlist->el[items].size,
-                    mountlist->el[items].label,
-                    mountlist->el[items].uuid);
+                    mountlist->el[items].label);
             items++;
         }
@@ -953 +951 @@
                 mountlist->el[i].device, mountlist->el[i].mountpoint,
                 mountlist->el[i].format, mountlist->el[i].size,
-                mountlist->el[i].label, mountlist->el[i].uuid);
+                mountlist->el[i].label);
     }
     paranoid_fclose(fout);