From 661eb8b877d97f63eeace196ea42b7baa292cb27 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Fri, 13 Nov 2015 15:35:10 +0000
Subject: [PATCH] Provide makeerror() when we don't have builtin-compress.

---
 src/compress.c | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/compress.c b/src/compress.c
index 28a4ae9a..c5a08d33 100644
--- a/src/compress.c
+++ b/src/compress.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: compress.c,v 1.88 2015/11/11 22:30:29 christos Exp $")
+FILE_RCSID("@(#)$File: compress.c,v 1.89 2015/11/11 22:50:12 christos Exp $")
 #endif
 
 #include "magic.h"
@@ -435,25 +435,6 @@ file_pipe2file(struct magic_set *ms, int fd, const void *startbuf,
 #define FNAME		(1 << 3)
 #define FCOMMENT	(1 << 4)
 
-static int
-makeerror(unsigned char **buf, size_t *len, const char *fmt, ...)
-{
-	char *msg;
-	va_list ap;
-	int rv;
-
-	va_start(ap, fmt);
-	rv = vasprintf(&msg, fmt, ap);
-	va_end(ap);
-	if (rv < 0) {
-		*buf = NULL;
-		*len = 0;
-		return NODATA;
-	}
-	*buf = (unsigned char *)msg;
-	*len = strlen(msg);
-	return ERRDATA;
-}
 
 private int
 uncompressgzipped(const unsigned char *old, unsigned char **newch, size_t *n)
@@ -532,6 +513,26 @@ err:
 }
 #endif
 
+static int
+makeerror(unsigned char **buf, size_t *len, const char *fmt, ...)
+{
+	char *msg;
+	va_list ap;
+	int rv;
+
+	va_start(ap, fmt);
+	rv = vasprintf(&msg, fmt, ap);
+	va_end(ap);
+	if (rv < 0) {
+		*buf = NULL;
+		*len = 0;
+		return NODATA;
+	}
+	*buf = (unsigned char *)msg;
+	*len = strlen(msg);
+	return ERRDATA;
+}
+
 static void
 closefd(int *fd, size_t i)
 {
-- 
2.40.0