Merge with basic-improvements branch as of 2002-09-19.

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@57346 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 9 deletions

diff --git a/fastjar/jartool.c b/fastjar/jartool.c
index bb3440353a0..7aa624808d4 100644
--- a/fastjar/jartool.c
+++ b/fastjar/jartool.c
@@ -327,7 +327,6 @@ int main(int argc, char **argv){
   int manifest = TRUE;
   int opt;
   
-  int j;
   int jarfd = -1;
   
   /* These are used to collect file names and `-C' options for the
@@ -345,8 +344,6 @@ int main(int argc, char **argv){
   if(argc < 2)
     usage(argv[0]);
   
-  j = strlen(argv[1]);
-  
   new_argc = 0;
   new_argv = (char **) malloc (argc * sizeof (char *));
 
@@ -1121,13 +1118,10 @@ int create_central_header(int fd){
   ub1 end_header[22];
   int start_offset;
   int dir_size;
-  int *iheader;
   int total_in = 0, total_out = 22;
 
   zipentry *ze;
 
-  iheader = (int*)header;
-
   /* magic number */
   header[0] = 'P';
   header[1] = 'K';
@@ -1550,7 +1544,6 @@ int extract_jar(int fd, char **files, int file_num){
 }
 
 int list_jar(int fd, char **files, int file_num){
-  int rdamt;
   ub4 signature;
   ub4 csize;
   ub4 usize;
@@ -1712,7 +1705,7 @@ int list_jar(int fd, char **files, int file_num){
     init_inflation();
 
     for(;;){
-      if((rdamt = pb_read(&pbf, scratch, 4)) != 4){
+      if(pb_read(&pbf, scratch, 4) != 4){
         perror("read");
         break;
       }
@@ -1741,7 +1734,7 @@ int list_jar(int fd, char **files, int file_num){
         break;
       }
       
-      if((rdamt = pb_read(&pbf, (file_header + 4), 26)) != 26){
+      if(pb_read(&pbf, (file_header + 4), 26) != 26){
         perror("read");
         break;
       }