Avoid maybe uninit warning in libmagic

GCC 5 false positive, gone in newer versions.

diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 6aa369bd0599ae094647558224a26c9cea2062e9..522bbcc71b8def5e179fdead914d2a1fb420c86e 100644 (file)
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -1,6 +1,6 @@
 diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 --- libmagic.orig/apprentice.c 2018-03-11 01:46:42.000000000 +0100
-+++ libmagic/apprentice.c      2019-04-12 10:04:15.721646341 +0200
++++ libmagic/apprentice.c      2019-04-15 10:57:47.115181746 +0200
 @@ -2,7 +2,7 @@
   * Copyright (c) Ian F. Darwin 1986-1995.
   * Software written by Ian F. Darwin and others;
@@ -945,7 +945,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 -      int fd;
 -      struct stat st;
 +      uint32_t *ptr;
-+      uint32_t version, entries, nentries;
++      uint32_t version, entries = 0, nentries;
 +      int needsbyteswap;
        char *dbname = NULL;
        struct magic_map *map;

diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 3355d3cc1eb5d14ca8e23e2a41863ad59628628c..b9bb65898c78a047a261874072d7c15d0938ebd3 100644 (file)
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -2954,7 +2954,7 @@ private struct magic_map *
 apprentice_map(struct magic_set *ms, const char *fn)
 {
        uint32_t *ptr;
-       uint32_t version, entries, nentries;
+       uint32_t version, entries = 0, nentries;
        int needsbyteswap;
        char *dbname = NULL;
        struct magic_map *map;