WebSVN – SvarDOS – Diff – /svarlang.lib/trunk/tlumacz.c

 int main(int argc, char **argv) {
   FILE *fd;
   int ecode = 0;
   int i, output_format = C_OUTPUT;
   unsigned short biggest_langsz = 0;
-  struct svl_lang *lang, *reflang = NULL;
+  struct svl_lang *lang = NULL, *reflang = NULL;
   if (argc < 2) {
     puts("tlumacz ver " SVARLANGVER " - this tool is part of the SvarLANG project.");
     puts("converts a set of CATS-style translations in files EN.TXT, PL.TXT, etc");
     puts("into a single resource file (OUT.LNG).");
+    }
     if (strlen(argv[i]) != 2) {
       fprintf(stderr, "INVALID LANG SPECIFIED: %s\r\n", argv[i]);
       ecode = 1;
-      break;
+      goto exit_main;
+    }
     id[0] = argv[i][0];
     id[1] = argv[i][1];
     id[2] = 0;
     if ((lang = svl_lang_new(id, DICT_CAP, STRINGS_CAP)) == NULL) {
       fprintf(stderr, "OUT OF MEMORY\r\n");
-      return(1);
+      ecode = 1;
+      goto exit_main;
+    }
     sz = svl_lang_from_cats_file(lang, reflang);
     if (sz == 0) {
       fprintf(stderr, "ERROR COMPUTING LANG '%s'\r\n", id);
       ecode = 1;
-      break;
+      goto exit_main;
     } else {
       printf("computed %s lang block of %u bytes\r\n", id, sz);
       if (sz > biggest_langsz) biggest_langsz = sz;
+    }
     svl_compact_lang(lang);
     /* write header if first (reference) language */
     if (i == 1) {
       if (!svl_write_header(lang->num_strings, fd)) {
         fprintf(stderr, "ERROR WRITING TO OUTPUT FILE\r\n");
         ecode = 1;
-        break;
+        goto exit_main;
+      }
+    }
     /* write lang ID to file, followed string table size, and then
        the dictionary and string table for current language */
     if (!svl_write_lang(lang, fd)) {
       fprintf(stderr, "ERROR WRITING TO OUTPUT FILE\r\n");
       ecode = 1;
-      break;
+      goto exit_main;
+    }
     /* remember reference data for other languages */
     if (!reflang) {
       reflang = lang;
       svl_lang_free(lang);
       lang = NULL;
+    }
+  }
-  if (ecode) return ecode;
   if (!reflang) {
     fprintf(stderr, "ERROR: NO LANGUAGE GIVEN\r\n");
-    return 1;
+    ecode = 1;
+    goto exit_main;
+  }
   /* compute the deflang file containing a dump of the reference block */
   if (output_format == C_OUTPUT) {
     if (!svl_write_c_source(reflang, "deflang.c", biggest_langsz)) {
       fprintf(stderr, "ERROR: FAILED TO OPEN OR CREATE DEFLANG.INC\r\n");
       ecode = 1;
+    }
+  }
+exit_main:
+  if (lang && lang != reflang) {
+    svl_lang_free(lang);
+  }
+  if (reflang) {
-  svl_lang_free(reflang);
+    svl_lang_free(reflang);
-  reflang = NULL;
+    reflang = NULL;
+    lang = NULL;
+  }
+  fclose(fd);
   return(ecode);
+}

Subversion Repositories SvarDOS

(root)/svarlang.lib/trunk/tlumacz.c – Rev 2014 → 2015