com php-src: Remove unused variables: ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/funcs.c ext/gd/gd.c ext/gd/libgd/gd_gif _in.c
ext/gd/libgd/gdhelpers.c ext/standard/formatted _print.c ext/zip/php_zip.c

Commit: b6f9ade9f201c852430689caf8ed8af0ded0159a Author: Fabien Villepinte <fabien.villepinte@cdbdx.biz> Fri, 8 Mar 2019 13:23:07 +0100 Committer: Christoph M. Becker <cmbecker69@gmx.de> Sun, 17 Mar 2019 23:29:51 +0100 Parents: eabca6f87a143e169f977bb4a1d115983529b41b Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6f9ade9f201c852430689caf8ed8af0ded0159a Log: Remove unused variables Changed paths: M ext/fileinfo/libmagic.patch M ext/fileinfo/libmagic/funcs.c M ext/gd/gd.c M ext/gd/libgd/gd_gif_in.c M ext/gd/libgd/gdhelpers.c M ext/standard/formatted_print.c M ext/zip/php_zip.c Diff: diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch index 9eb377f..36723da 100644 --- a/ext/fileinfo/libmagic.patch +++ b/ext/fileinfo/libmagic.patch @@ -2840,17 +2840,16 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c { - int rv; va_list ap; -+ size_t len; + char *buf = NULL, *newstr; va_start(ap, fmt); - rv = file_vprintf(ms, fmt, ap); -+ len = vspprintf(&buf, 0, fmt, ap); ++ vspprintf(&buf, 0, fmt, ap); va_end(ap); - return rv; + + if (ms->o.buf != NULL) { -+ len = spprintf(&newstr, 0, "%s%s", ms->o.buf, (buf ? buf : "")); ++ spprintf(&newstr, 0, "%s%s", ms->o.buf, (buf ? buf : "")); + if (buf) { + efree(buf); + } @@ -2904,7 +2903,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c ms->event_flags |= EVENT_HAD_ERR; ms->error = error; } -@@ -160,7 +158,6 @@ +@@ -160,7 +157,6 @@ file_error(ms, errno, "error reading"); } @@ -2912,7 +2911,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c static int checkdone(struct magic_set *ms, int *rv) -@@ -174,8 +171,8 @@ +@@ -174,8 +170,8 @@ /*ARGSUSED*/ protected int @@ -2923,7 +2922,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c { int m = 0, rv = 0, looks_text = 0; const char *code = NULL; -@@ -184,7 +181,8 @@ +@@ -184,7 +180,8 @@ const char *def = "data"; const char *ftype = NULL; struct buffer b; @@ -2933,7 +2932,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c buffer_init(&b, fd, buf, nb); if (nb == 0) { -@@ -216,8 +214,8 @@ +@@ -216,8 +213,8 @@ } } #endif @@ -2944,7 +2943,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) == 0) { m = file_zmagic(ms, &b, inname); if ((ms->flags & MAGIC_DEBUG) != 0) -@@ -239,13 +237,22 @@ +@@ -239,13 +236,22 @@ } /* Check if we have a CDF file */ @@ -2974,7 +2973,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c } } -@@ -315,7 +322,7 @@ +@@ -315,7 +321,7 @@ if (file_printf(ms, "%s", code_mime) == -1) rv = -1; } @@ -2983,7 +2982,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c done_encoding: #endif buffer_fini(&b); -@@ -324,7 +331,6 @@ +@@ -324,7 +330,6 @@ return m; } @@ -2991,7 +2990,7 @@ diff -u libmagic..orig/funcs.c libmagic/funcs.c protected int file_reset(struct magic_set *ms, int checkloaded) -@@ -334,11 +340,11 @@ +@@ -334,11 +339,11 @@ return -1; } if (ms->o.buf) { @@ -3005,7 +3004,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c ms->o.pbuf = NULL; } ms->event_flags &= ~EVENT_HAD_ERR; -@@ -376,7 +382,7 @@ +@@ -376,7 +381,7 @@ return NULL; } psize = len * 4 + 1; @@ -3014,7 +3013,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c file_oomem(ms, psize); return NULL; } -@@ -440,8 +446,8 @@ +@@ -440,8 +445,8 @@ if (level >= ms->c.len) { len = (ms->c.len = 20 + level) * sizeof(*ms->c.li); ms->c.li = CAST(struct level_info *, (ms->c.li == NULL) ? @@ -3025,7 +3024,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c if (ms->c.li == NULL) { file_oomem(ms, len); return -1; -@@ -464,76 +470,41 @@ +@@ -464,76 +469,41 @@ protected int file_replace(struct magic_set *ms, const char *pat, const char *rep) { @@ -3131,7 +3130,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c } protected file_pushbuf_t * -@@ -544,7 +515,7 @@ +@@ -544,7 +514,7 @@ if (ms->event_flags & EVENT_HAD_ERR) return NULL; @@ -3140,7 +3139,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c return NULL; pb->buf = ms->o.buf; -@@ -562,8 +533,8 @@ +@@ -562,8 +532,8 @@ char *rbuf; if (ms->event_flags & EVENT_HAD_ERR) { @@ -3151,7 +3150,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c return NULL; } -@@ -572,7 +543,7 @@ +@@ -572,7 +542,7 @@ ms->o.buf = pb->buf; ms->offset = pb->offset; diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c index 8377bcc..08ecaa3 100644 --- a/ext/fileinfo/libmagic/funcs.c +++ b/ext/fileinfo/libmagic/funcs.c @@ -60,15 +60,14 @@ protected int file_printf(struct magic_set *ms, const char *fmt, ...) { va_list ap; - size_t len; char *buf = NULL, *newstr; va_start(ap, fmt); - len = vspprintf(&buf, 0, fmt, ap); + vspprintf(&buf, 0, fmt, ap); va_end(ap); if (ms->o.buf != NULL) { - len = spprintf(&newstr, 0, "%s%s", ms->o.buf, (buf ? buf : "")); + spprintf(&newstr, 0, "%s%s", ms->o.buf, (buf ? buf : "")); if (buf) { efree(buf); } diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 6849be1..1c03b65 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2592,7 +2592,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char FILE *fp; size_t file_len = 0; int argc = ZEND_NUM_ARGS(); - int q = -1, i, t = 1; + int q = -1, t = 1; /* The quality parameter for Wbmp stands for the foreground when called from image2wbmp() */ /* The quality parameter for gd2 stands for chunk size */ diff --git a/ext/gd/libgd/gd_gif_in.c b/ext/gd/libgd/gd_gif_in.c index 8b2a1b4..f78e7f3 100644 --- a/ext/gd/libgd/gd_gif_in.c +++ b/ext/gd/libgd/gd_gif_in.c @@ -139,7 +139,7 @@ gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr fd) /* {{{ */ unsigned char ColorMap[3][MAXCOLORMAPSIZE]; unsigned char localColorMap[3][MAXCOLORMAPSIZE]; int imw, imh, screen_width, screen_height; - int gif87a, useGlobalColormap; + int useGlobalColormap; int bitPixel; int i; /*1.4//int imageCount = 0; */ @@ -160,9 +160,9 @@ gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr fd) /* {{{ */ } if (memcmp((char *)buf+3, "87a", 3) == 0) { - gif87a = 1; + /* GIF87a */ } else if (memcmp((char *)buf+3, "89a", 3) == 0) { - gif87a = 0; + /* GIF89a */ } else { return 0; } diff --git a/ext/gd/libgd/gdhelpers.c b/ext/gd/libgd/gdhelpers.c index ae2428d..44b79ac 100644 --- a/ext/gd/libgd/gdhelpers.c +++ b/ext/gd/libgd/gdhelpers.c @@ -15,7 +15,6 @@ char * gd_strtok_r (char *s, char *sep, char **state) { char separators[256]; - char *start; char *result = 0; memset (separators, 0, sizeof (separators)); while (*sep) @@ -28,7 +27,6 @@ gd_strtok_r (char *s, char *sep, char **state) /* Pick up where we left off */ s = *state; } - start = s; /* 1. EOS */ if (!(*s)) { diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index ae1e529..e534d94 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -363,7 +363,7 @@ php_sprintf_getnumber(char **buffer, size_t *len) if (endptr != NULL) { i = (endptr - *buffer); - *len -= endptr - *buffer; + *len -= i; *buffer = endptr; } PRINTF_DEBUG(("sprintf_getnumber: number was %d bytes long\n", i)); diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 9275ab1..02b8b6c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -619,7 +619,6 @@ int php_zip_pcre(zend_string *regexp, char *path, int path_len, zval *return_val { #ifdef ZTS char cwd[MAXPATHLEN]; - int cwd_skip = 0; char work_path[MAXPATHLEN]; char *result; #endif @@ -638,8 +637,6 @@ int php_zip_pcre(zend_string *regexp, char *path, int path_len, zval *return_val cwd[2] = '\0'; } #endif - cwd_skip = strlen(cwd)+1; - snprintf(work_path, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, path); path = work_path; }