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

 int svarlang_load(const char *fname, const char *lang) {
   unsigned short langid;
   unsigned short buff16[2];
   FHANDLE fd;
+  signed char exitcode = 0;
   struct {
     unsigned long sig;
     unsigned short string_count;
   } hdr;
   fd = FOPEN(fname);
   if (!fd) return(-1);
   /* read hdr, sig should be "SvL\x1a" (0x1a4c7653) */
   if ((FREAD(fd, &hdr, 6) != 6) || (hdr.sig != 0x1a4c7653L) || (hdr.string_count != svarlang_string_count)) {
-    FCLOSE(fd);
+    exitcode = -2;
-    return(-2);
+    goto FCLOSE_AND_EXIT;
+  }
   for (;;) {
     /* read next lang id and string table size in file */
     if (FREAD(fd, buff16, 4) != 4) {
-      FCLOSE(fd);
+      exitcode = -3;
-      return(-3);
+      goto FCLOSE_AND_EXIT;
+    }
     /* is it the lang I am looking for? */
     if (buff16[0] == langid) break;
   /* load dictionary & strings, but only if I have enough memory space */
   if ((buff16[1] >= svarlang_memsz)
    || (FREAD(fd, svarlang_dict, svarlang_string_count * 4) != svarlang_string_count * 4)
    || (FREAD(fd, svarlang_mem, buff16[1]) != buff16[1])) {
-    FCLOSE(fd);
-    return(-4);
+    exitcode = -4;
+  }
+  FCLOSE_AND_EXIT:
   FCLOSE(fd);
-  return(0);
+  return(exitcode);
+}

Subversion Repositories SvarDOS