Changeset 738 in MondoRescue for branches/stable

Timestamp:

Aug 3, 2006, 11:17:09 PM (18 years ago)

Author:

andree

Message:

Fixed compiler warnings on amd64 (and likely 64bit in general):

• "cast to pointer from integer of different size" by making relevant variables long rather than int which gives 32bit on i386 and 64bit on amd64;
• "cast from pointer to integer of different size" by casting to long rather than int for same reasons.

Location:

branches/stable/mondo/mondo

Files:

• common/newt-specific.c (modified) (2 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (6 diffs)

branches/stable/mondo/mondo/common/newt-specific.c

@@ -1605 +1605 @@
 
         /*@ int ************************************************************* */
-        int i = 0;
         int currline = 0;
         int finished = FALSE;
+
+        /*@ long ************************************************************ */
+        long i = 0;
         long lng = 0;
 
@@ -1657 +1659 @@
         }
         sprintf(differ_sz,
-                "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
+                "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
                 i);
         newtPushHelpLine(differ_sz);

branches/stable/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -928 +928 @@
     static int lines_in_flist_window = 0;
     static int depth = 0;
-    int i = 0;
+
+    /** long **************************************************************/
+    long i = 0;
 
     /** structures *******************************************************/
@@ -1373 +1375 @@
         }
     }
-    newtListboxSetEntry(listbox, (int) keylist[currline],
+    newtListboxSetEntry(listbox, (long) keylist[currline],
                         mountlist_entry_to_string(mountlist, currline));
     /* if new /dev/md RAID device then do funky stuff */
@@ -2495 +2497 @@
 {
 
-    /** int *************************************************************/
-    int i = 0;
+    /** long **************************************************************/
+    long i = 0;
 
     assert(disklist != NULL);
@@ -2527 +2529 @@
 {
 
-    /** int **************************************************************/
-    int i = 0;
+    /** long **************************************************************/
+    long i = 0;
 
     assert(mountlist != NULL);
@@ -2562 +2564 @@
 {
 
-    /** int **************************************************************/
-    int i = 0;
+    /** long *************************************************************/
+    long i = 0;
 
     /** buffers **********************************************************/
@@ -2596 +2598 @@
                 void *keylist[], newtComponent listbox)
 {
-    /** int *************************************************************/
-    int i = 0;
+    /** long ************************************************************/
+    long i = 0;
 
     /** buffers *********************************************************/