Changeset 3347 in MondoRescue

Timestamp:

Feb 26, 2015, 12:21:28 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix #767 (typo in KEYDIR name proposed) (joel.girot_at_gvr.fr)
• Do not use long in loop as previsouly modified as it doesn' make sense.

Location:

branches

Files:

• 3.0/mindi/mindi (modified) (1 diff)
• 3.2/mindi/mindi (modified) (1 diff)
• 3.2/mondo/src/common/libmondo-archive.c (modified) (2 diffs)

branches/3.0/mindi/mindi

@@ -375 +375 @@
     KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
-    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
-    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console-setup
     [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
     if [ ! -e "$KEYDIR" ] ; then

branches/3.2/mindi/mindi

@@ -375 +375 @@
     KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
-    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
-    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console-setup
     [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
     if [ ! -e "$KEYDIR" ] ; then

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -2780 +2780 @@
     long slice_num = 0L;
     long i = 0L;
+    int j = 0;
     bool should_I_compress_slices = TRUE;
     char *suffix = NULL;                // for compressed slices
@@ -2899 +2900 @@
         }
         if ((i == bkpinfo->optimal_set_size / 256L) && (totalread < 1.1 * totallength)) {
-            for (long j = 0L; j < bkpinfo->optimal_set_size / 256L; j++) {
+            for (j = 0; j < (int) (bkpinfo->optimal_set_size / 256); j++) {
                 blksize = fread(tempblock, 1, 256 * 1024, fin);
                 if (blksize > 0) {