Changeset 2370 in MondoRescue

Timestamp:

Sep 7, 2009, 6:56:40 PM (15 years ago)

Author:

Bruno Cornec

Message:

Backport 2 syntax fixes from 2.2.9

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-filelist.c (modified) (2 diffs)

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

@@ -1732 +1732 @@
             if (bkpinfo->restore_data) {
                 mr_asprintf(tmp, "mount -t nfs -o nolock,ro %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
-            else {
+            } else {
                 mr_asprintf(tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
             }

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -1273 +1273 @@
  */
 long g_skeleton_entries = 0;
+
+
+/**
+ * Get the next entry in the space-separated list in @p incoming.
+ * So if @p incoming was '"one and two" three four', we would
+ * return "one and two".
+ * @param incoming The list to get the next entry from.
+ * @return The first item in the list (respecting double quotes).
+ * @note The returned string points to static data that will be overwritten with each call.
+ */
+char *next_entry(char *incoming)
+{
+    char *sz_res;
+    char *p;
+    bool in_quotes = FALSE;
+
+    mr_asprintf(sz_res, "%s", incoming);
+    p = sz_res;
+    while ((*p != ' ' || in_quotes) && *p != '\0') {
+        if (*p == '\"') {
+            in_quotes = !in_quotes;
+        }
+        p++;
+    }
+    *p = '\0';
+    return (sz_res);
+}
+
 
 
@@ -1648 +1676 @@
 
 /**
- * Get the next entry in the space-separated list in @p incoming.
- * So if @p incoming was '"one and two" three four', we would
- * return "one and two".
- * @param incoming The list to get the next entry from.
- * @return The first item in the list (respecting double quotes).
- * @note The returned string points to static data that will be overwritten with each call.
- */
-char *next_entry(char *incoming)
-{
-    char *sz_res;
-    char *p;
-    bool in_quotes = FALSE;
-
-    mr_asprintf(sz_res, "%s", incoming);
-    p = sz_res;
-    while ((*p != ' ' || in_quotes) && *p != '\0') {
-        if (*p == '\"') {
-            in_quotes = !in_quotes;
-        }
-        p++;
-    }
-    *p = '\0';
-    return (sz_res);
-}
-
-
-
-/**
  * Locate the string @p string_to_find in the tree rooted at @p startnode.
  * @param startnode The node containing the root of the directory tree.