cleanup

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4779 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 6 insertions, 7 deletions

diff --git a/editor/specialty/pnmindex.c b/editor/specialty/pnmindex.c
index cd8ecfba..4cd467b0 100644
--- a/editor/specialty/pnmindex.c
+++ b/editor/specialty/pnmindex.c
@@ -602,13 +602,11 @@ combineIntoRowAndDelete(unsigned int const row,
                         const char * const tempDir) {
 
     const char * const blackWhiteOpt = blackBackground ? "-black" : "-white";
+    const char * const fileName = rowFileName(tempDir, row);
 
-    const char * fileName;
     const char * quantStage;
     const char * fileList;
 
-    fileName = rowFileName(tempDir, row);
-
     unlink(fileName);
 
     if (maxFormatType == PPM_TYPE && quant)
@@ -714,14 +712,15 @@ main(int argc, const char ** argv) {
 
     makeTempDir(&tempDir);
 
-    maxFormatType = PBM_TYPE;
-    colsInRow = 0;
-    rowsDone = 0;
+    rowsDone = 0;  /* initial value */
 
     if (cmdline.title)
         makeTitle(cmdline.title, rowsDone++, cmdline.black, tempDir);
 
-    for (i = 0; i < cmdline.inputFileCount; ++i) {
+    for (i = 0, colsInRow = 0, maxFormatType = PBM_TYPE;
+         i < cmdline.inputFileCount;
+         ++i) {
+
         const char * const inputFileName = cmdline.inputFileName[i];
 
         int format;