[e2tools] Remove unused code parts triggering new gcc warning in f15
Hans Ulrich Niedermann
ndim at fedoraproject.org
Wed Feb 9 12:11:24 UTC 2011
commit 4b18ed1b9ab6c90ad50d6a73afb9252a94ef507b
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Wed Feb 9 13:10:14 2011 +0100
Remove unused code parts triggering new gcc warning in f15
e2tools-fedora-fixes.patch | 126 +++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 65 deletions(-)
---
diff --git a/e2tools-fedora-fixes.patch b/e2tools-fedora-fixes.patch
index 5cbad50..52450d8 100644
--- a/e2tools-fedora-fixes.patch
+++ b/e2tools-fedora-fixes.patch
@@ -1,8 +1,6 @@
-Only in e2tools-0.0.16.fedora: _b
-Only in e2tools-0.0.16.fedora: configure.in~
-diff -rup e2tools-0.0.16.orig/copy.c e2tools-0.0.16.fedora/copy.c
---- e2tools-0.0.16.orig/copy.c 2004-04-07 03:15:20.000000000 +0200
-+++ e2tools-0.0.16.fedora/copy.c 2006-07-17 11:55:48.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/copy.c e2tools-0.0.16-fedora-fixes/copy.c
+--- e2tools-0.0.16-orig/copy.c 2004-04-07 03:15:20.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/copy.c 2011-02-09 12:41:51.363614109 +0100
@@ -239,11 +239,10 @@ copy(int argc, char *argv[])
{
ext2_filsys fs = NULL;
@@ -33,10 +31,9 @@ diff -rup e2tools-0.0.16.orig/copy.c e2tools-0.0.16.fedora/copy.c
boundary = inbuf + BUF_SIZE - 1;
ptr = inbuf;
-Only in e2tools-0.0.16.fedora: copy.c~
-diff -rup e2tools-0.0.16.orig/e2tools.h e2tools-0.0.16.fedora/e2tools.h
---- e2tools-0.0.16.orig/e2tools.h 2004-04-07 03:15:55.000000000 +0200
-+++ e2tools-0.0.16.fedora/e2tools.h 2006-07-17 12:02:16.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/e2tools.h e2tools-0.0.16-fedora-fixes/e2tools.h
+--- e2tools-0.0.16-orig/e2tools.h 2004-04-07 03:15:55.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/e2tools.h 2011-02-09 12:41:51.364614115 +0100
@@ -57,44 +57,45 @@ extern int optreset; /* defined by BSD,
#include <fcntl.h>
#include <sys/types.h>
@@ -136,12 +133,9 @@ diff -rup e2tools-0.0.16.orig/e2tools.h e2tools-0.0.16.fedora/e2tools.h
-#endif
-Only in e2tools-0.0.16.fedora: e2tools.h~
-Only in e2tools-0.0.16.fedora: e2tools-test.sh
-Only in e2tools-0.0.16.fedora: e2tools-test.sh~
-diff -rup e2tools-0.0.16.orig/elist.c e2tools-0.0.16.fedora/elist.c
---- e2tools-0.0.16.orig/elist.c 2004-04-06 22:00:16.000000000 +0200
-+++ e2tools-0.0.16.fedora/elist.c 2006-07-17 11:44:07.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/elist.c e2tools-0.0.16-fedora-fixes/elist.c
+--- e2tools-0.0.16-orig/elist.c 2004-04-06 22:00:16.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/elist.c 2011-02-09 12:41:51.364614115 +0100
@@ -41,6 +41,7 @@
/* Feature Test Switches */
/* Headers */
@@ -168,11 +162,9 @@ diff -rup e2tools-0.0.16.orig/elist.c e2tools-0.0.16.fedora/elist.c
{
int c=0;
elist_t *tl;
-Only in e2tools-0.0.16.fedora: elist.c~
-Only in e2tools-0.0.16.fedora: _i
-diff -rup e2tools-0.0.16.orig/ln.c e2tools-0.0.16.fedora/ln.c
---- e2tools-0.0.16.orig/ln.c 2002-06-30 07:54:02.000000000 +0200
-+++ e2tools-0.0.16.fedora/ln.c 2006-07-17 11:44:27.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/ln.c e2tools-0.0.16-fedora-fixes/ln.c
+--- e2tools-0.0.16-orig/ln.c 2002-06-30 07:54:02.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/ln.c 2011-02-09 12:41:51.365614122 +0100
@@ -95,7 +95,6 @@ do_ln(int argc, char *argv[])
int verbose=0;
int force=0;
@@ -181,10 +173,9 @@ diff -rup e2tools-0.0.16.orig/ln.c e2tools-0.0.16.fedora/ln.c
int errcnt=0;
char *cur_filesys = NULL;
ext2_filsys fs = NULL;
-Only in e2tools-0.0.16.fedora: ln.c~
-diff -rup e2tools-0.0.16.orig/ls.c e2tools-0.0.16.fedora/ls.c
---- e2tools-0.0.16.orig/ls.c 2004-04-07 05:31:39.000000000 +0200
-+++ e2tools-0.0.16.fedora/ls.c 2006-07-17 11:48:12.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/ls.c e2tools-0.0.16-fedora-fixes/ls.c
+--- e2tools-0.0.16-orig/ls.c 2004-04-07 05:31:39.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/ls.c 2011-02-09 12:41:51.367614136 +0100
@@ -143,7 +143,6 @@ static int
list_dir_proc(ext2_ino_t dir, int entry, struct ext2_dir_entry *dirent,
int offset, int blocksize, char *buf, void *private)
@@ -221,10 +212,9 @@ diff -rup e2tools-0.0.16.orig/ls.c e2tools-0.0.16.fedora/ls.c
int cnt=0;
while(list != NULL)
-Only in e2tools-0.0.16.fedora: ls.c~
-diff -rup e2tools-0.0.16.orig/Makefile.am e2tools-0.0.16.fedora/Makefile.am
---- e2tools-0.0.16.orig/Makefile.am 2003-07-12 19:06:54.000000000 +0200
-+++ e2tools-0.0.16.fedora/Makefile.am 2006-07-17 12:22:28.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/Makefile.am e2tools-0.0.16-fedora-fixes/Makefile.am
+--- e2tools-0.0.16-orig/Makefile.am 2003-07-12 19:06:54.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/Makefile.am 2011-02-09 12:41:51.367614136 +0100
@@ -27,3 +27,11 @@ install-exec-hook:
$(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2mv
$(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2rm
@@ -237,11 +227,9 @@ diff -rup e2tools-0.0.16.orig/Makefile.am e2tools-0.0.16.fedora/Makefile.am
+ $(RM) -f $(DESTDIR)$(bindir)/e2mv
+ $(RM) -f $(DESTDIR)$(bindir)/e2rm
+ $(RM) -f $(DESTDIR)$(bindir)/e2tail
-Only in e2tools-0.0.16.fedora: Makefile.am~
-Only in e2tools-0.0.16.fedora: Makefile.in~
-diff -rup e2tools-0.0.16.orig/mkdir.c e2tools-0.0.16.fedora/mkdir.c
---- e2tools-0.0.16.orig/mkdir.c 2004-04-07 05:19:32.000000000 +0200
-+++ e2tools-0.0.16.fedora/mkdir.c 2006-07-17 12:06:33.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/mkdir.c e2tools-0.0.16-fedora-fixes/mkdir.c
+--- e2tools-0.0.16-orig/mkdir.c 2004-04-07 05:19:32.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/mkdir.c 2011-02-09 12:41:51.369614150 +0100
@@ -281,7 +281,6 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
ext2_ino_t parent; /* the parent directory inode number*/
ext2_ino_t child; /* the inode number of the new directory */
@@ -333,10 +321,9 @@ diff -rup e2tools-0.0.16.orig/mkdir.c e2tools-0.0.16.fedora/mkdir.c
/* get a new inode number */
if ((retval = ext2fs_new_inode(fs, parent, LINUX_S_IFDIR | 0755, 0, &child)))
{
-Only in e2tools-0.0.16.fedora: mkdir.c~
-diff -rup e2tools-0.0.16.orig/mv.c e2tools-0.0.16.fedora/mv.c
---- e2tools-0.0.16.orig/mv.c 2002-06-09 23:30:25.000000000 +0200
-+++ e2tools-0.0.16.fedora/mv.c 2006-07-17 11:58:30.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/mv.c e2tools-0.0.16-fedora-fixes/mv.c
+--- e2tools-0.0.16-orig/mv.c 2002-06-09 23:30:25.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/mv.c 2011-02-09 12:41:51.370614157 +0100
@@ -84,7 +84,6 @@ do_mv(int argc, char *argv[])
int verbose=0;
int force=0;
@@ -345,12 +332,9 @@ diff -rup e2tools-0.0.16.orig/mv.c e2tools-0.0.16.fedora/mv.c
int errcnt=0;
char *cur_filesys = NULL;
ext2_filsys fs = NULL;
-Only in e2tools-0.0.16.fedora: mv.c~
-Only in e2tools-0.0.16.fedora: mv.h
-Only in e2tools-0.0.16.fedora: mv.h~
-diff -rup e2tools-0.0.16.orig/progress.c e2tools-0.0.16.fedora/progress.c
---- e2tools-0.0.16.orig/progress.c 2002-06-26 13:18:07.000000000 +0200
-+++ e2tools-0.0.16.fedora/progress.c 2006-07-17 11:46:38.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/progress.c e2tools-0.0.16-fedora-fixes/progress.c
+--- e2tools-0.0.16-orig/progress.c 2002-06-26 13:18:07.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/progress.c 2011-02-09 12:41:51.371614163 +0100
@@ -27,6 +27,7 @@
/* System Headers */
#include <stdio.h>
@@ -368,10 +352,9 @@ diff -rup e2tools-0.0.16.orig/progress.c e2tools-0.0.16.fedora/progress.c
prog_sbuf->st_size);
fflush(stderr);
}
-Only in e2tools-0.0.16.fedora: progress.c~
-diff -rup e2tools-0.0.16.orig/read.c e2tools-0.0.16.fedora/read.c
---- e2tools-0.0.16.orig/read.c 2002-08-08 09:58:35.000000000 +0200
-+++ e2tools-0.0.16.fedora/read.c 2006-07-17 11:52:12.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/read.c e2tools-0.0.16-fedora-fixes/read.c
+--- e2tools-0.0.16-orig/read.c 2002-08-08 09:58:35.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/read.c 2011-02-09 12:41:51.371614163 +0100
@@ -9,9 +9,7 @@
*
*/
@@ -391,11 +374,9 @@ diff -rup e2tools-0.0.16.orig/read.c e2tools-0.0.16.fedora/read.c
ext2_ino_t src;
int dest;
int retval;
-Only in e2tools-0.0.16.fedora: read.c~
-Only in e2tools-0.0.16.fedora: README~
-diff -rup e2tools-0.0.16.orig/rm.c e2tools-0.0.16.fedora/rm.c
---- e2tools-0.0.16.orig/rm.c 2004-04-07 04:00:43.000000000 +0200
-+++ e2tools-0.0.16.fedora/rm.c 2006-07-21 16:13:25.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/rm.c e2tools-0.0.16-fedora-fixes/rm.c
+--- e2tools-0.0.16-orig/rm.c 2004-04-07 04:00:43.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/rm.c 2011-02-09 12:41:51.372614169 +0100
@@ -244,8 +244,8 @@ e2rm(int argc, char *argv[])
retval = ext2fs_dir_iterate2(gbl_fs, curr_ino,
DIRENT_FLAG_INCLUDE_EMPTY, 0,
@@ -407,10 +388,27 @@ diff -rup e2tools-0.0.16.orig/rm.c e2tools-0.0.16.fedora/rm.c
}
else
{
-Only in e2tools-0.0.16.fedora: rm.c~
-diff -rup e2tools-0.0.16.orig/tail.c e2tools-0.0.16.fedora/tail.c
---- e2tools-0.0.16.orig/tail.c 2003-07-12 18:33:11.000000000 +0200
-+++ e2tools-0.0.16.fedora/tail.c 2006-07-17 12:39:06.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/tail.c e2tools-0.0.16-fedora-fixes/tail.c
+--- e2tools-0.0.16-orig/tail.c 2003-07-12 18:33:11.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/tail.c 2011-02-09 12:48:54.842042527 +0100
+@@ -109,7 +109,7 @@ tail(ext2_filsys *fs, ext2_ino_t root, c
+ long
+ do_tail(int argc, char *argv[])
+ {
+- int verbose=0;
++ /* unused int verbose=0; */
+ int follow=0;
+ int num_lines = 5;
+ int sleep_int = 1;
+@@ -131,7 +131,7 @@ do_tail(int argc, char *argv[])
+ switch (c)
+ {
+ case 'v':
+- verbose = 1;
++ /* unused verbose = 1; */
+ break;
+ case 'f':
+ follow = FOLLOW_INODE;
@@ -251,7 +251,6 @@ tail(ext2_filsys *fs_ptr, ext2_ino_t roo
unsigned int bytes_to_read;
unsigned int bytes_read;
@@ -446,10 +444,10 @@ diff -rup e2tools-0.0.16.orig/tail.c e2tools-0.0.16.fedora/tail.c
/* retreive the current position in the file */
if ((retval = ext2fs_file_lseek(tail_fd, 0, EXT2_SEEK_CUR, &cur_pos)))
-Only in e2tools-0.0.16.fedora: tail.c~
-diff -rup e2tools-0.0.16.orig/util.c e2tools-0.0.16.fedora/util.c
---- e2tools-0.0.16.orig/util.c 2002-06-09 23:30:26.000000000 +0200
-+++ e2tools-0.0.16.fedora/util.c 2006-07-17 11:45:25.000000000 +0200
+Only in e2tools-0.0.16-fedora-fixes: tail.c~
+diff -rpu e2tools-0.0.16-orig/util.c e2tools-0.0.16-fedora-fixes/util.c
+--- e2tools-0.0.16-orig/util.c 2002-06-09 23:30:26.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/util.c 2011-02-09 12:41:51.374614182 +0100
@@ -276,10 +276,9 @@ make_regexp(char *shell)
char *tmpstr;
char *ptr;
@@ -462,10 +460,9 @@ diff -rup e2tools-0.0.16.orig/util.c e2tools-0.0.16.fedora/util.c
{
perror("make_regexp");
return(NULL);
-Only in e2tools-0.0.16.fedora: util.c~
-diff -rup e2tools-0.0.16.orig/write.c e2tools-0.0.16.fedora/write.c
---- e2tools-0.0.16.orig/write.c 2004-04-07 03:12:30.000000000 +0200
-+++ e2tools-0.0.16.fedora/write.c 2006-07-17 11:44:42.000000000 +0200
+diff -rpu e2tools-0.0.16-orig/write.c e2tools-0.0.16-fedora-fixes/write.c
+--- e2tools-0.0.16-orig/write.c 2004-04-07 03:12:30.000000000 +0200
++++ e2tools-0.0.16-fedora-fixes/write.c 2011-02-09 12:41:51.375614189 +0100
@@ -9,8 +9,6 @@
* and modified by Robert Sanders <gt8134b at prism.gatech.edu>
*/
@@ -475,4 +472,3 @@ diff -rup e2tools-0.0.16.orig/write.c e2tools-0.0.16.fedora/write.c
#ifndef WRITE_C
#define WRITE_C
#endif
-Only in e2tools-0.0.16.fedora: write.c~
More information about the scm-commits
mailing list