Patch: FYI: warning avoidance in fastjar

[Tom Tromey]

I'm checking this in on the trunk.

Ben Elliston pointed out that fastjar has some gratuitous warnings.
This fixes them.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* compress.c (write_data): Mark 'ze' as unused.
	* jartool.h (__attribute__): New define.
	* shift.c (shift_up): Added cast.
	(shift_down): Likewise.
	* jartool.c (help): Split string constant.

Index: jartool.c
===================================================================
--- jartool.c	(revision 107670)
+++ jartool.c	(working copy)
@@ -2245,6 +2245,8 @@
   -E              don't include the files found in a directory\n\
   -f FILE         specify archive file name\n\
   --help          print this help, then exit\n\
+");
+  printf("\
   -m FILE         include manifest information from specified manifest file\n\
   -M              Do not create a manifest file for the entries\n\
   -v              generate verbose output on standard output\n\
Index: shift.c
===================================================================
--- shift.c	(revision 107670)
+++ shift.c	(working copy)
@@ -1,5 +1,5 @@
 /* shift.c -- utilities to move regions of data in a file.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -81,7 +81,7 @@
 
   for (; ze; ze = ze->next_entry)
     {
-      if (ze->offset >= begin)
+      if ((off_t) ze->offset >= begin)
 	{
 	  ze->offset -= amount;
 	  moved = 1;
@@ -150,7 +150,7 @@
 
   for (; ze; ze = ze->next_entry)
     {
-      if (ze->offset >= begin)
+      if ((off_t) ze->offset >= begin)
 	{
 	  ze->offset += amount;
 	  moved = 1;
Index: jartool.h
===================================================================
--- jartool.h	(revision 107670)
+++ jartool.h	(working copy)
@@ -35,7 +35,7 @@
 
 /*
   jartool.h - generic defines, struct defs etc.
-  Copyright (C) 1999  Bryan Burns
+  Copyright (C) 1999, 2005  Bryan Burns
   
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
@@ -116,4 +116,8 @@
 
 typedef struct zipentry zipentry;
 
+#ifndef __GNUC__
+#define __attribute__()
+#endif
+
 #endif /* __FASTJAR_JARTOOL_H__ */
Index: compress.c
===================================================================
--- compress.c	(revision 107670)
+++ compress.c	(working copy)
@@ -139,7 +139,8 @@
 }
 
 int
-write_data (int fd, void *buf, size_t len, struct zipentry *ze)
+write_data (int fd, void *buf, size_t len,
+	    struct zipentry *ze __attribute__((unused)))
 {
 #ifdef WITH_SHIFT_DOWN
   struct zipentry *next = NULL;