File suse11.2-gcc-includes.patch of Package ext2undelete

Overview Repositories Revisions Requests Users Attributes Meta

File suse11.2-gcc-includes.patch of Package ext2undelete

diff -Naur orig/undelete-0.6//ext2fs_interface.c undelete-0.6/ext2fs_interface.c
--- orig/undelete-0.6//ext2fs_interface.c	1997-07-29 19:27:25.000000000 +0200
+++ undelete-0.6/ext2fs_interface.c	2009-12-02 15:33:05.737863741 +0100
@@ -269,7 +269,7 @@
 	}
 
 	display_status("reading new block", CAT_WORK);
-	retval = read_block(&blockadr, blkbuf);
+	retval = read_block(&blockadr, (char*) blkbuf);
        	if (retval) {
 		display_status("error reading new block", CAT_ALERT);
                	return(-1) ;
diff -Naur orig/undelete-0.6//lsdel.c undelete-0.6/lsdel.c
--- orig/undelete-0.6//lsdel.c	2009-12-02 15:34:27.557864017 +0100
+++ undelete-0.6/lsdel.c	2009-12-02 13:47:45.149105673 +0100
@@ -19,6 +19,7 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <linux/fs.h>
 #include <linux/ext2_fs.h>
 
 #include "undelete.h"
diff -Naur orig/undelete-0.6//undelete.c undelete-0.6/undelete.c
--- orig/undelete-0.6//undelete.c	1997-07-29 19:25:36.000000000 +0200
+++ undelete-0.6/undelete.c	2009-12-02 13:48:51.871104741 +0100
@@ -8,6 +8,7 @@
 
 #include "undelete.h"
 #include <getopt.h>
+#include <string.h>
 
 int age , force_open;
 char *device;
diff -Naur orig/undelete-0.6//undelete.h undelete-0.6/undelete.h
--- orig/undelete-0.6//undelete.h	2000-01-12 13:31:44.000000000 +0100
+++ undelete-0.6/undelete.h	2009-12-02 15:30:25.258863406 +0100
@@ -2,6 +2,7 @@
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <linux/fs.h>
 #include <linux/ext2_fs.h>
 #include "ext2fs/ext2fs.h"
 
@@ -88,7 +89,7 @@
 extern int			num_delarray;
 extern struct deleted_info	*delarray;
 extern ext2_filsys		current_fs;
-extern struct lswincursor 	lswincursor;
+// extern struct lswincursor 	lswincursor;
 extern char (*blockdata)[80];
 extern int age , force_open;
 extern char *device;
diff -Naur orig/undelete-0.6//user_interface.c undelete-0.6/user_interface.c
--- orig/undelete-0.6//user_interface.c	2000-01-12 13:34:05.000000000 +0100
+++ undelete-0.6/user_interface.c	2009-12-02 15:28:17.645863842 +0100
@@ -27,7 +27,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <time.h>
-#include <form.h>
+#include <ncurses/form.h>
 
 
 struct lswincursor {
@@ -202,7 +202,7 @@
 		break;
 	}
    }
-   blocknr = atoi(f[1]->buf);
+   blocknr = atoi((const char *)f[1]->buf);
    
 	da_index = lswincursor.listhook + lswincursor.cursorpos;
 	if (blocknr < data_end(delarray[da_index].size)-1) {
@@ -263,8 +263,8 @@
 		break;
 	}
    }
-   trim_buffer(f[1]->buf);
-} while(open_filesystem(f[1]->buf, force_open));
+   trim_buffer((char*)f[1]->buf);
+} while(open_filesystem((char*)f[1]->buf, force_open));
 	
    read_lsdel(age);
    process_delarray();
@@ -314,7 +314,7 @@
 		break;
 	}
    }
-   age = atoi(f[1]->buf);
+   age = atoi((const char *)f[1]->buf);
    read_lsdel(age);
    process_delarray();
    init_listwindow();
@@ -359,8 +359,8 @@
 	}
    }
 
-   trim_buffer(f[1]->buf);
-   strcpy(delarray[da_index].filename, f[1]->buf);
+   trim_buffer((char*)f[1]->buf);
+   strcpy(delarray[da_index].filename, (const char *)f[1]->buf);
    wmove(lsdelwindow, lswincursor.cursorpos, 0);
    wclrtoeol(lsdelwindow);
    mvwaddstr(lsdelwindow, lswincursor.cursorpos, 0, delarray[da_index].filename);

Places

File suse11.2-gcc-includes.patch of Package ext2undelete

Places