@@ -1316,7 +1316,7 @@ static int buildcld(const char *tmpdir, const char *dbname, const char *newfile,

 	char cwd[512], info[32], buff[513], *pt;

 	struct dirent *dent;

 	int fd, err = 0;

-	gzFile *gzs = NULL;

+	gzFile gzs = NULL;

     if(!getcwd(cwd, sizeof(cwd))) {

 	logg("!buildcld: Can't get path of current working directory\n");

@@ -54,7 +54,7 @@ static int cli_untgz(int fd, const char *destdir)

 	unsigned int size, pathlen = strlen(destdir) + 100 + 5;

 	FILE *outfile = NULL;

 	struct stat foo;

-	gzFile *infile;

+	gzFile infile;

     cli_dbgmsg("in cli_untgz()\n");

@@ -28,7 +28,7 @@

 #include "sha256.h"

 struct cli_dbio {

-    gzFile *gzs;

+    gzFile gzs;

     FILE *fs;

     unsigned int size, bread;

     char *buf, *bufpt, *readpt;

@@ -479,7 +479,7 @@ static inline void html_tag_contents_append(struct tag_contents *cont, const uns

             if (mbchar && (c < 0x80 || mbchar >= 0x10000)) {

                 if (mbchar == 0xE38082 || mbchar == 0xEFBC8E

                     || mbchar == 0xEFB992 ||

-                    mbchar == 0xA1 && (c == 0x43 || c == 0x44 || c == 0x4F)) {

+                    (mbchar == 0xA1 && (c == 0x43 || c == 0x44 || c == 0x4F))) {

                     cont->contents[i++] = '.';

                     if (mbchar == 0xA1) {

                         --i;

@@ -786,7 +786,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

                                 if (*ptr < 0x80 || mbchar >= 0x10000) {

                                     if (mbchar == 0xE38082 || mbchar == 0xEFBC8E

                                         || mbchar == 0xEFB992 ||

-                                        mbchar == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F)) {

+                                        (mbchar == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {

                                         /* bb #4097 */

                                         html_output_c(file_buff_o2, '.');

                                         html_output_c(file_buff_text, '.');

@@ -1084,7 +1084,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

                                     if (mbchar2 && (*ptr < 0x80 || mbchar2 >= 0x10000)) {

                                         if (mbchar2 == 0xE38082 || mbchar2 == 0xEFBC8E

                                             || mbchar2 == 0xEFB992 ||

-                                            mbchar2 == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F)) {

+                                            (mbchar2 == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {

                                             html_output_c(file_buff_o2, '.');

                                             if (tag_val_length < HTML_STR_LENGTH)

 						tag_val[tag_val_length++] = '.';

@@ -757,7 +757,7 @@ int cdiff_apply(int fd, unsigned short mode)

 {

 	struct cdiff_ctx ctx;

 	FILE *fh;

-	gzFile *gzh;

+	gzFile gzh;

 	char *line, *lbuf, buff[FILEBUFF], *dsig = NULL;

 	unsigned int lines = 0, cmds = 0;

 	unsigned int difflen, diffremain, line_size = CDIFF_LINE_SIZE;

@@ -47,7 +47,7 @@ struct tar_header {

 };

 #define TARBLK 512

-int tar_addfile(int fd, gzFile *gzs, const char *file)

+int tar_addfile(int fd, gzFile gzs, const char *file)

 {

 	int s, bytes;

 	struct tar_header hdr;

@@ -23,6 +23,6 @@

 #include <zlib.h>

-int tar_addfile(int fd, gzFile *gzs, const char *file);

+int tar_addfile(int fd, gzFile gzs, const char *file);

 #endif

@@ -500,7 +500,7 @@ static int script2cdiff(const char *script, const char *builder, const struct op

 	SHA256_CTX ctx;

 	struct stat sb;

 	FILE *scripth, *cdiffh;

-	gzFile *gzh;

+	gzFile gzh;

 	unsigned int ver, osize;

 	int bytes;

@@ -629,7 +629,7 @@ static int build(const struct optstruct *opts)

 	const char *newcvd, *localdbdir = NULL;

         struct cl_engine *engine;

 	FILE *cvd, *fh;

-	gzFile *tar;

+	gzFile tar;

 	time_t timet;

 	struct tm *brokent;

 	struct cl_cvd *oldcvd;