delete trailing whitespace from control files

[debian/gzip] / gzip.h

diff --git a/gzip.h b/gzip.h
index ae273a6bc44a784bb7b47bf32232b10fe9a936ba..329c9a517f1e789c61d2aea4de84c68cc77ffedf 100644 (file)
--- a/gzip.h
+++ b/gzip.h
@@ -1,11 +1,13 @@
 /* gzip.h -- common declarations for all gzip modules
 
 /* gzip.h -- common declarations for all gzip modules
 

-   Copyright (C) 1997, 1998, 1999, 2001, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2001, 2006-2007, 2009-2018 Free Software
+   Foundation, Inc.
+

    Copyright (C) 1992-1993 Jean-loup Gailly.
 
    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
    Copyright (C) 1992-1993 Jean-loup Gailly.
 
    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

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,12 +19,6 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 

-#if defined(__STDC__) || defined(PROTO)
-#  define OF(args)  args
-#else
-#  define OF(args)  ()
-#endif
-

 #ifdef __STDC__
    typedef void *voidp;
 #else
 #ifdef __STDC__
    typedef void *voidp;
 #else


@@ -35,33 +31,15 @@
 # endif
 #endif
 
 # endif
 #endif
 

-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-#endif
-

 /* I don't like nested includes, but the following headers are used
  * too often
  */
 #include <stdio.h>
 /* I don't like nested includes, but the following headers are used
  * too often
  */
 #include <stdio.h>

-#include <sys/types.h> /* for off_t, time_t */
-#if defined HAVE_STRING_H || defined STDC_HEADERS
-#  include <string.h>
-#  if !defined STDC_HEADERS && defined HAVE_MEMORY_H && !defined __GNUC__
-#    include <memory.h>
-#  endif
-#  define memzero(s, n)     memset ((voidp)(s), 0, (n))
-#else
-#  include <strings.h>
-#  define strchr            index
-#  define strrchr           rindex
-#  define memcpy(d, s, n)   bcopy((s), (d), (n))
-#  define memcmp(s1, s2, n) bcmp((s1), (s2), (n))
-#  define memzero(s, n)     bzero((s), (n))
-#endif
-
-#ifndef RETSIGTYPE
-#  define RETSIGTYPE void
-#endif
+#include <sys/types.h> /* for off_t */
+#include <time.h>
+#include <string.h>
+#include <stdnoreturn.h>
+#define memzero(s, n) memset ((voidp)(s), 0, (n))

 
 #define local static
 
 
 #define local static
 


@@ -167,7 +145,7 @@ extern char ifname[];   /* input file name or "stdin" */
 extern char ofname[];   /* output file name or "stdout" */
 extern char *program_name;  /* program name */
 
 extern char ofname[];   /* output file name or "stdout" */
 extern char *program_name;  /* program name */
 

-extern struct timespec time_stamp; /* original time stamp (modification time) */
+extern struct timespec time_stamp; /* original timestamp (modification time) */

 extern off_t ifile_size; /* input file size, -1 for devices (debug only) */
 
 typedef int file_t;     /* Do not use stdio */
 extern off_t ifile_size; /* input file size, -1 for devices (debug only) */
 
 typedef int file_t;     /* Do not use stdio */


@@ -182,7 +160,7 @@ typedef int file_t;     /* Do not use stdio */
 
 /* gzip flag byte */
 #define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
 
 /* gzip flag byte */
 #define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */

-#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
+#define HEADER_CRC   0x02 /* bit 1 set: CRC16 for the gzip header */

 #define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
 #define ORIG_NAME    0x08 /* bit 3 set: original file name present */
 #define COMMENT      0x10 /* bit 4 set: file comment present */
 #define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
 #define ORIG_NAME    0x08 /* bit 3 set: original file name present */
 #define COMMENT      0x10 /* bit 4 set: file comment present */


@@ -212,7 +190,6 @@ typedef int file_t;     /* Do not use stdio */
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 

-extern int decrypt;        /* flag to turn on decryption */

 extern int exit_code;      /* program exit code */
 extern int verbose;        /* be verbose (-v) */
 extern int quiet;          /* be quiet (-q) */
 extern int exit_code;      /* program exit code */
 extern int verbose;        /* be verbose (-v) */
 extern int quiet;          /* be quiet (-q) */


@@ -278,66 +255,63 @@ extern int save_orig_name; /* set if original name must be saved */
 #endif
 
 #define WARN(msg) {if (!quiet) fprintf msg ; \
 #endif
 
 #define WARN(msg) {if (!quiet) fprintf msg ; \

-                  if (exit_code == OK) exit_code = WARNING;}
+                   if (exit_code == OK) exit_code = WARNING;}

 
 

-       /* in zip.c: */
-extern int zip        OF((int in, int out));
-extern int file_read  OF((char *buf,  unsigned size));
+        /* in zip.c: */
+extern int zip        (int in, int out);
+extern int file_read  (char *buf,  unsigned size);

 
 

-       /* in unzip.c */
-extern int unzip      OF((int in, int out));
-extern int check_zipfile OF((int in));
+        /* in unzip.c */
+extern int unzip      (int in, int out);
+extern int check_zipfile (int in);

 
 

-       /* in unpack.c */
-extern int unpack     OF((int in, int out));
+        /* in unpack.c */
+extern int unpack     (int in, int out);

 
 

-       /* in unlzh.c */
-extern int unlzh      OF((int in, int out));
+        /* in unlzh.c */
+extern int unlzh      (int in, int out);

 
 

-       /* in gzip.c */
-void abort_gzip OF((void)) ATTRIBUTE_NORETURN;
+        /* in gzip.c */
+extern noreturn void abort_gzip (void);

 
         /* in deflate.c */
 
         /* in deflate.c */

-void lm_init OF((int pack_level, ush *flags));
-off_t deflate OF((void));
+extern void lm_init (int pack_level, ush *flags);
+extern off_t deflate (void);

 
         /* in trees.c */
 
         /* in trees.c */

-void ct_init     OF((ush *attr, int *method));
-int  ct_tally    OF((int dist, int lc));
-off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof));
+extern void ct_init     (ush *attr, int *method);
+extern int  ct_tally    (int dist, int lc);
+extern off_t flush_block (char *buf, ulg stored_len, int pad, int eof);

 
         /* in bits.c */
 
         /* in bits.c */

-void     bi_init    OF((file_t zipfile));
-void     send_bits  OF((int value, int length));
-unsigned bi_reverse OF((unsigned value, int length));
-void     bi_windup  OF((void));
-void     copy_block OF((char *buf, unsigned len, int header));
-extern   int (*read_buf) OF((char *buf, unsigned size));
-
-       /* in util.c: */
-extern int copy           OF((int in, int out));
-extern ulg  updcrc        OF((uch *s, unsigned n));
-extern void clear_bufs    OF((void));
-extern int  fill_inbuf    OF((int eof_ok));
-extern void flush_outbuf  OF((void));
-extern void flush_window  OF((void));
-extern void write_buf     OF((int fd, voidp buf, unsigned cnt));
-extern int read_buffer    OF((int fd, voidp buf, unsigned int cnt));
-extern char *strlwr       OF((char *s));
-extern char *gzip_base_name OF((char *fname));
-extern int xunlink        OF((char *fname));
-extern void make_simple_name OF((char *name));
-extern char *add_envopt   OF((int *argcp, char ***argvp, char *env));
-extern void gzip_error    OF((char *m));
-extern void xalloc_die    OF((void)) ATTRIBUTE_NORETURN;
-extern void warning       OF((char *m));
-extern void read_error    OF((void));
-extern void write_error   OF((void));
-extern void display_ratio OF((off_t num, off_t den, FILE *file));
-extern void fprint_off    OF((FILE *, off_t, int));
-
-       /* in inflate.c */
-extern int inflate OF((void));
-
-       /* in yesno.c */
-extern int yesno OF((void));
+extern void     bi_init    (file_t zipfile);
+extern void     send_bits  (int value, int length);
+extern unsigned bi_reverse (unsigned value, int length) _GL_ATTRIBUTE_CONST;
+extern void     bi_windup  (void);
+extern void     copy_block (char *buf, unsigned len, int header);
+extern int     (*read_buf) (char *buf, unsigned size);
+
+        /* in util.c: */
+extern int copy           (int in, int out);
+extern ulg  updcrc        (uch *s, unsigned n);
+extern void clear_bufs    (void);
+extern int  fill_inbuf    (int eof_ok);
+extern void flush_outbuf  (void);
+extern void flush_window  (void);
+extern void write_buf     (int fd, voidp buf, unsigned cnt);
+extern int read_buffer    (int fd, voidp buf, unsigned int cnt);
+extern char *strlwr       (char *s);
+extern char *gzip_base_name (char *fname) _GL_ATTRIBUTE_PURE;
+extern int xunlink        (char *fname);
+extern void make_simple_name (char *name);
+extern char *add_envopt   (int *argcp, char ***argvp, char const *env);
+extern noreturn void gzip_error    (char const *m);
+extern noreturn void xalloc_die    (void);
+extern void warning       (char const *m);
+extern noreturn void read_error    (void);
+extern noreturn void write_error   (void);
+extern void display_ratio (off_t num, off_t den, FILE *file);
+extern void fprint_off    (FILE *, off_t, int);
+
+        /* in inflate.c */
+extern int inflate (void);