Changeset 1648 in MondoRescue

Timestamp:

Sep 24, 2007, 3:29:03 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix remaining issue on libmondo-verify

File:

• branches/2.2.5/mondo/src/common/libmondo-verify.c (modified) (3 diffs)

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

@@ -115 +115 @@
 //static char cvsid[] = "$Id$";
 
-char *vfy_tball_fname(struct s_bkpinfo *, char *, int);
-
-
 /**
  * The number of the most recently verified afioball.
@@ -130 +127 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
+
+
+/**
+ * Generate the filename of a tarball to verify.
+ * @param bkpinfo The backup information structure. @c bkpinfo->zip_suffix is the only field used.
+ * @param mountpoint The directory where the CD/DVD/ISO is mounted.
+ * @param setno The afioball number to get the location of.
+ * @return The absolute path to the afioball.
+ * @note The returned string points to static data that will be overwritten with each call.
+ * @ingroup stringGroup
+ */
+char *vfy_tball_fname(char *mountpoint, int setno)
+{
+    /*@ buffers ******************************************************* */
+    static char output[MAX_STR_LEN];
+
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno,
+            bkpinfo->zip_suffix);
+    if (!does_file_exist(output)) {
+        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno,
+                bkpinfo->zip_suffix);
+    }
+    return (output);
+}
+
 
 /**
@@ -1219 +1243 @@
 
 
-/**
- * Generate the filename of a tarball to verify.
- * @param bkpinfo The backup information structure. @c bkpinfo->zip_suffix is the only field used.
- * @param mountpoint The directory where the CD/DVD/ISO is mounted.
- * @param setno The afioball number to get the location of.
- * @return The absolute path to the afioball.
- * @note The returned string points to static data that will be overwritten with each call.
- * @ingroup stringGroup
- */
-char *vfy_tball_fname(char *mountpoint, int setno)
-{
-    /*@ buffers ******************************************************* */
-    static char output[MAX_STR_LEN];
-
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno,
-            bkpinfo->zip_suffix);
-    if (!does_file_exist(output)) {
-        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno,
-                bkpinfo->zip_suffix);
-    }
-    return (output);
-}