pcrs_filter_impl(): Improve wording of a log message

[privoxy.git] / deanimate.c

diff --git a/deanimate.c b/deanimate.c
index 3ad4e2b..bba74d4 100644 (file)
--- a/deanimate.c
+++ b/deanimate.c
@@ -1,4 +1,3 @@
-const char deanimate_rcs[] = "$Id: deanimate.c,v 1.19 2008/05/21 15:29:35 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/deanimate.c,v $
@@ -6,20 +5,16 @@ const char deanimate_rcs[] = "$Id: deanimate.c,v 1.19 2008/05/21 15:29:35 fabian
  * Purpose     :  Declares functions to manipulate binary images on the
  *                fly.  High-level functions include:
  *                  - Deanimation of GIF images
- *                
- *                Functions declared include: gif_deanimate, buf_free,
- *                buf_copy,  buf_getbyte, gif_skip_data_block
- *                and gif_extract_image
  *
  * Copyright   :  Written by and Copyright (C) 2001 - 2004, 2006 by the
- *                SourceForge Privoxy team. http://www.privoxy.org/
+ *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the GIF file format specification (see
  *                http://tronche.com/computer-graphics/gif/gif89a.html)
  *                and ideas from the Image::DeAnim Perl module by
  *                Ken MacFarlane, <ksm+cpan@universal.dca.net>
  *
- *                This program is free software; you can redistribute it 
+ *                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 of the License, or (at
@@ -45,15 +40,13 @@ const char deanimate_rcs[] = "$Id: deanimate.c,v 1.19 2008/05/21 15:29:35 fabian
 #include <string.h>
 #include <fcntl.h>
 
-#include "errlog.h"
 #include "project.h"
+#include "errlog.h"
 #include "deanimate.h"
 #include "miscutil.h"
 
-const char deanimate_h_rcs[] = DEANIMATE_H_VERSION;
-
 /*********************************************************************
- * 
+ *
  * Function    :  buf_free
  *
  * Description :  Safely frees a struct binbuffer
@@ -79,7 +72,7 @@ void buf_free(struct binbuffer *buf)
 
 
 /*********************************************************************
- * 
+ *
  * Function    :  buf_extend
  *
  * Description :  Ensure that a given binbuffer can hold a given amount
@@ -90,7 +83,7 @@ void buf_free(struct binbuffer *buf)
  * Parameters  :
  *          1  :  buf = Pointer to the binbuffer
  *          2  :  length = Desired minimum size
- *                
+ *
  *
  * Returns     :  0 on success, 1 on failure.
  *
@@ -121,7 +114,7 @@ static int buf_extend(struct binbuffer *buf, size_t length)
 
 
 /*********************************************************************
- * 
+ *
  * Function    :  buf_copy
  *
  * Description :  Safely copies a given amount of bytes from one
@@ -142,7 +135,7 @@ static int buf_copy(struct binbuffer *src, struct binbuffer *dst, size_t length)
    /*
     * Sanity check: Can't copy more data than we have
     */
-   if (src->offset + length > src->size) 
+   if (src->offset + length > src->size)
    {
       return 1;
    }
@@ -150,7 +143,7 @@ static int buf_copy(struct binbuffer *src, struct binbuffer *dst, size_t length)
    /*
     * Ensure that dst can hold the new data
     */
-   if (buf_extend(dst, length)) 
+   if (buf_extend(dst, length))
    {
       return 1;
    }
@@ -169,7 +162,7 @@ static int buf_copy(struct binbuffer *src, struct binbuffer *dst, size_t length)
 
 
 /*********************************************************************
- * 
+ *
  * Function    :  buf_getbyte
  *
  * Description :  Safely gets a byte from a given binbuffer at a
@@ -197,7 +190,7 @@ static unsigned char buf_getbyte(const struct binbuffer *src, size_t offset)
 
 
 /*********************************************************************
- * 
+ *
  * Function    :  gif_skip_data_block
  *
  * Description :  Safely advances the offset of a given struct binbuffer
@@ -215,7 +208,7 @@ static int gif_skip_data_block(struct binbuffer *buf)
 {
    unsigned char c;
 
-   /* 
+   /*
     * Data blocks are sequences of chunks, which are headed
     * by a one-byte length field, with the last chunk having
     * zero length.
@@ -236,12 +229,12 @@ static int gif_skip_data_block(struct binbuffer *buf)
 
 
 /*********************************************************************
- * 
+ *
  * Function    :  gif_extract_image
  *
  * Description :  Safely extracts an image data block from a given
  *                struct binbuffer that contains a GIF image and whose
- *                offset is positioned at the start of a data block 
+ *                offset is positioned at the start of a data block
  *                into a given destination binbuffer.
  *
  * Parameters  :
@@ -279,7 +272,7 @@ static int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
       if (buf_copy(src, dst, (size_t)map_length))
       {
          return 1;
-      }           
+      }
    }
    if (buf_copy(src, dst, 1)) return 1;
 
@@ -304,15 +297,15 @@ static int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
 }
 
 /*********************************************************************
- * 
+ *
  * Function    :  gif_deanimate
  *
  * Description :  Deanimate a given GIF image, i.e. given a GIF with
  *                an (optional) image block and an arbitrary number
  *                of image extension blocks, produce an output GIF with
  *                only one image block that contains the last image
- *                (extenstion) block of the original.
- *                Also strip Comments, Application extenstions, etc.
+ *                (extension) block of the original.
+ *                Also strip Comments, Application extensions, etc.
  *
  * Parameters  :
  *          1  :  src = Pointer to the source binbuffer
@@ -336,9 +329,9 @@ int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
    c = buf_getbyte(src, 10);
 
    /*
-    * Check & copy GIF header 
+    * Check & copy GIF header
     */
-   if (strncmp(src->buffer, "GIF89a", 6) && strncmp(src->buffer, "GIF87a", 6)) 
+   if (strncmp(src->buffer, "GIF89a", 6) && strncmp(src->buffer, "GIF87a", 6))
    {
       return 1;
    }
@@ -353,7 +346,7 @@ int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
    /*
     * Look for global colormap and  copy if found.
     */
-   if(c & 0x80)
+   if (c & 0x80)
    {
       int map_length = 3 * (1 << ((c & 0x07) + 1));
       if (map_length <= 0)
@@ -371,10 +364,7 @@ int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
    /*
     * Reserve a buffer for the current image block
     */
-   if (NULL == (image = (struct binbuffer *)zalloc(sizeof(*image))))
-   {
-      return 1;
-   }
+   image = zalloc_or_die(sizeof(*image));
 
    /*
     * Parse the GIF block by block and copy the relevant
@@ -390,7 +380,7 @@ int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
       case 0x3b:
          goto write;
 
-         /* 
+         /*
           * Image block: Extract to current image buffer.
           */
       case 0x2c:
@@ -450,13 +440,13 @@ int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
           */
       default:
          goto failed;
-         
+
       }
    } /* -END- while src */
 
    /*
     * Either we got here by goto, or because the GIF is
-    * bogus and EOF was reached before an end-of-gif marker 
+    * bogus and EOF was reached before an end-of-gif marker
     * was found.
     */