Changeset 3855 in MondoRescue

Timestamp:

Mar 6, 2024, 3:43:29 AM (4 months ago)

Author:

Bruno Cornec

Message:

Fix save_disklist_to_file and resolve_naff_tokens protos

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-fork.c (modified) (1 diff)
• libmondo-raid-EXT.h (modified) (1 diff)
• libmondo-raid.c (modified) (2 diffs)
• libmondo-raid.h (modified) (1 diff)
• libmondo-string-EXT.h (modified) (1 diff)

branches/3.3/mondo/src/common/libmondo-fork.c

@@ -11 +11 @@
 #include "mr_sys.h"
 #include "mondostructures.h"
-#include "libmondo-fork.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-gui-EXT.h"

branches/3.3/mondo/src/common/libmondo-raid-EXT.h

@@ -27 +27 @@
                                  FILE * fout);
 
-extern void
-save_disklist_to_file(char *listname,
-                      struct list_of_disks *disklist, FILE * fout);
-
-
 #ifdef __FreeBSD__
 extern void add_disk_to_raid_device(struct vinum_plex *p,

branches/3.3/mondo/src/common/libmondo-raid.c

@@ -320 +320 @@
 }
 
+
+/**
+ * Save a disklist to a stream in raidtab format.
+ * @param listname One of "raid-disk", "spare-disk", "parity-disk", or "failed-disk".
+ * @param disklist The disklist to save to @p fout.
+ * @param fout The stream to write to.
+ */
+void save_disklist_to_file(const char *listname, struct list_of_disks *disklist, FILE * fout)
+{
+    int i;
+
+    assert_string_is_neither_NULL_nor_zerolength(listname);
+    assert(disklist != NULL);
+    assert(fout != NULL);
+
+    for (i = 0; i < disklist->entries; i++) {
+        fprintf(fout, "    device                %s\n", disklist->el[i].device);
+        fprintf(fout, "    %-21s %d\n", listname, disklist->el[i].index);
+    }
+}
 
 /**
@@ -732 +752 @@
 }
 #endif
-
-
-/**
- * Save a disklist to a stream in raidtab format.
- * @param listname One of "raid-disk", "spare-disk", "parity-disk", or "failed-disk".
- * @param disklist The disklist to save to @p fout.
- * @param fout The stream to write to.
- */
-void
-save_disklist_to_file(char *listname, struct list_of_disks *disklist, FILE * fout)
-{
-    int i;
-
-    assert_string_is_neither_NULL_nor_zerolength(listname);
-    assert(disklist != NULL);
-    assert(fout != NULL);
-
-    for (i = 0; i < disklist->entries; i++) {
-        fprintf(fout, "    device                %s\n", disklist->el[i].device);
-        fprintf(fout, "    %-21s %d\n", listname, disklist->el[i].index);
-    }
-}
-
-
-
 
 

branches/3.3/mondo/src/common/libmondo-raid.h

@@ -22 +22 @@
                              char *fname);
 void save_raidrec_to_file(struct raid_device_record *raidrec, FILE * fout);
-void
-save_disklist_to_file(char *listname,
-                      struct list_of_disks *disklist, FILE * fout);
 #ifdef __FreeBSD__
 void add_disk_to_raid_device(struct vinum_plex *p, char *device_to_add);

branches/3.3/mondo/src/common/libmondo-string-EXT.h

@@ -17 +17 @@
 extern char *number_to_text(int i);
 extern void resolve_naff_tokens(char *output, char *ip, char *value,
-                                char *token);
+                                const char *token);
 extern char *slice_fname(long bigfileno, long sliceno, char *path,
                          char *s);