diff options
| -rw-r--r-- | fastjar/ChangeLog | 8 | ||||
| -rw-r--r-- | fastjar/compress.c | 3 | ||||
| -rw-r--r-- | fastjar/jartool.c | 2 | ||||
| -rw-r--r-- | fastjar/jartool.h | 6 | ||||
| -rw-r--r-- | fastjar/shift.c | 6 |
5 files changed, 20 insertions, 5 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index ebd826f..22dd6a96 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,11 @@ +2005-11-29 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. + 2005-06-29 Kelley Cook <kcook@gcc.gnu.org> * all files: Update FSF address. diff --git a/fastjar/compress.c b/fastjar/compress.c index 43d0884..84b3dad 100644 --- a/fastjar/compress.c +++ b/fastjar/compress.c @@ -139,7 +139,8 @@ void init_compression(){ } 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; diff --git a/fastjar/jartool.c b/fastjar/jartool.c index c90adec..0a1694e 100644 --- a/fastjar/jartool.c +++ b/fastjar/jartool.c @@ -2245,6 +2245,8 @@ Store many files together in a single `jar' file.\n\ -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\ diff --git a/fastjar/jartool.h b/fastjar/jartool.h index 76abda1..df16651 100644 --- a/fastjar/jartool.h +++ b/fastjar/jartool.h @@ -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 @@ struct zipentry { typedef struct zipentry zipentry; +#ifndef __GNUC__ +#define __attribute__() +#endif + #endif /* __FASTJAR_JARTOOL_H__ */ diff --git a/fastjar/shift.c b/fastjar/shift.c index 1ea2710..2b08a2e 100644 --- a/fastjar/shift.c +++ b/fastjar/shift.c @@ -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 @@ shift_up (int fd, off_t begin, off_t amount, struct zipentry *ze) 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 @@ shift_down (int fd, off_t begin, off_t amount, struct zipentry *ze) for (; ze; ze = ze->next_entry) { - if (ze->offset >= begin) + if ((off_t) ze->offset >= begin) { ze->offset += amount; moved = 1; |