From 71ffe074957b3bf4f12bf79ec9b16297a4557b66 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Thu, 1 Dec 2022 10:18:16 +0100
Subject: [PATCH] Fix longjmp warnings.

---
 jsarray.c |  2 +-
 pp.c      | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/jsarray.c b/jsarray.c
index f2ec75c..88f0c74 100644
--- a/jsarray.c
+++ b/jsarray.c
@@ -64,8 +64,8 @@ static void Ap_concat(js_State *J)
 static void Ap_join(js_State *J)
 {
 	char * volatile out = NULL;
+	const char * volatile r = NULL;
 	const char *sep;
-	const char *r;
 	int seplen;
 	int k, n, len, rlen;
 
diff --git a/pp.c b/pp.c
index 2dd7f85..ae5a780 100644
--- a/pp.c
+++ b/pp.c
@@ -75,6 +75,17 @@ void js_ppfile(js_State *J, const char *filename, int minify)
 	fclose(f);
 }
 
+static void js_tryppfile(js_State *J, const char *file, int minify)
+{
+	if (js_try(J)) {
+		js_report(J, js_trystring(J, -1, "Error"));
+		js_pop(J, 1);
+		return;
+	}
+	js_ppfile(J, file, minify);
+	js_endtry(J);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -91,15 +102,8 @@ main(int argc, char **argv)
 			minify = 2;
 		else if (!strcmp(argv[i], "-s"))
 			minify = 3;
-		else {
-			if (js_try(J)) {
-				js_report(J, js_trystring(J, -1, "Error"));
-				js_pop(J, 1);
-				continue;
-			}
-			js_ppfile(J, argv[i], minify);
-			js_endtry(J);
-		}
+		else
+			js_tryppfile(J, argv[i], minify);
 	}
 
 	js_gc(J, 0);