Fix up rpmuncompress not being compiled as C++

This one lone source got overlooked in the initial C++ enablement
in commit 37cdcc2. C++ doesn't like
jumping over variable declarations, so just move the declarations
early to minimally fix the build.

Nicely goes to show the danger of such hacks - you can always miss
something. On the library side things are likely to blow up in
linkage but you never know really.

tools/CMakeLists.txt

@@ -69,7 +69,7 @@ endif()
 set (cxx_sources
 	cliutils.c elfdeps.c rpm2archive.c rpmbuild.c rpm.c rpmdb.c
 	rpmdeps.c rpmdump.c rpmgraph.c rpmkeys.c rpmlua.c rpmsign.c
-	rpmsort.c rpmspec.c
+	rpmsort.c rpmspec.c rpmuncompress.c
 )
 set_source_files_properties(${cxx_sources} PROPERTIES LANGUAGE CXX)
 

tools/rpmuncompress.c

@@ -101,6 +101,7 @@ static char * singleRoot(const char *path)
 	struct archive_entry *entry;
 	int r, ret = -1, rootLen;
 	char *rootName = NULL;
+	char *sep = NULL;
 
 	a = archive_read_new();
 	archive_read_support_filter_all(a);
@@ -113,7 +114,7 @@ static char * singleRoot(const char *path)
 	    goto afree;
 	}
 	rootName = xstrdup(archive_entry_pathname(entry));
-	char *sep = strchr(rootName, '/');
+	sep = strchr(rootName, '/');
 	if (sep == NULL) {
 	    /* No directories in the pathname */
 	    ret = 0;
@@ -151,11 +152,12 @@ static char *doUntar(const char *fn)
     const char *taropts = verbose ? "-xvvof" : "-xof";
     char *mkdir = NULL;
     char *stripcd = NULL;
+    int needtar = 0;
 
     if ((at = getArchiver(fn)) == NULL)
 	goto exit;
 
-    int needtar = (at->extractable == 0);
+    needtar = (at->extractable == 0);
 
     if (dstpath) {
 	char * sr = singleRoot(fn);