From 45d46409b41c05cd5c5e3ea474a52fff94f7f166 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Thu, 20 Oct 2016 22:01:32 -0400
Subject: [PATCH] common:  Pull a couple of unnecessary globals into main().

---
 backend_common.c | 7 +++----
 backend_common.h | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/backend_common.c b/backend_common.c
index d7f87d6..51a7031 100644
--- a/backend_common.c
+++ b/backend_common.c
@@ -42,8 +42,6 @@ int extra_vid = -1;
 int extra_pid = -1;
 int extra_type = -1;
 int copies = 1;
-char *use_serno = NULL;
-int current_page = 0;
 
 /* Support Functions */
 static int backend_claim_interface(struct libusb_device_handle *dev, int iface)
@@ -714,8 +712,7 @@ void print_help(char *argv0, struct dyesub_backend *backend)
 		DEBUG("Standalone %s backend version %s\n",
 		      backend->name, backend->version);
 		DEBUG("\t%s\n", backend->uri_prefix);
-		DEBUG("\t[ -D ] [ -G ] \n");
-		DEBUG("\t[ -V extra_vid ] [ -P extra_pid ] [ -T extra_type ] \n");
+		DEBUG("\t[ -D ] [ -G ] [ -f ]\n");
 		if (backend->cmdline_usage)
 			backend->cmdline_usage();
 		DEBUG("\t[ -d copies ] [ infile | - ]\n");
@@ -754,9 +751,11 @@ int main (int argc, char **argv)
 	int iface = 0;
 	int found = -1;
 	int jobid = 0;
+	int current_page = 0;
 
 	char *uri;
 	char *fname = NULL;
+	char *use_serno = NULL;
 
 	DEBUG("Multi-Call Dye-sublimation CUPS Backend version %s\n",
 	      BACKEND_VERSION);
diff --git a/backend_common.h b/backend_common.h
index 353e749..4bc583a 100644
--- a/backend_common.h
+++ b/backend_common.h
@@ -170,8 +170,6 @@ extern int extra_vid;
 extern int extra_pid;
 extern int extra_type;
 extern int copies;
-extern char *use_serno;
-extern int current_page;
 
 #if defined(BACKEND)
 extern struct dyesub_backend BACKEND;