Imported Upstream version 1.3.14

[debian/gzip] / util.c

diff --git a/util.c b/util.c
index 82988adf38ab57f6daf3763246eee2b7343b5be2..40b36fc3a1f4ac7eea0a6e6df326435673326691 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,12 +1,12 @@
 /* util.c -- utility functions for gzip support
 
 /* util.c -- utility functions for gzip support
 

-   Copyright (C) 1997, 1998, 1999, 2001, 2002, 2006 Free Software
-   Foundation, Inc.
+   Copyright (C) 1997-1999, 2001-2002, 2006, 2009 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,


@@ -18,10 +18,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.  */
 

-#ifdef RCSID
-static char rcsid[] = "$Id: util.c,v 1.6 2006/12/11 18:54:39 eggert Exp $";
-#endif
-

 #include <config.h>
 #include <ctype.h>
 #include <errno.h>
 #include <config.h>
 #include <ctype.h>
 #include <errno.h>


@@ -392,7 +388,7 @@ char *add_envopt(argcp, argvp, env)
     /* Allocate the new argv array, with an extra element just in case
      * the original arg list did not end with a NULL.
      */
     /* Allocate the new argv array, with an extra element just in case
      * the original arg list did not end with a NULL.
      */

-    nargv = (char **) xcalloc (*argcp + 1, sizeof (char *));
+    nargv = xcalloc (*argcp + 1, sizeof (char *));

     oargv  = *argvp;
     *argvp = nargv;
 
     oargv  = *argvp;
     *argvp = nargv;