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

   if ((FREAD(fd, &hdr, 6) != 6) || (hdr.sig != 0x1a4c7653L) || (hdr.string_count != svarlang_string_count)) {
     FCLOSE(fd);
     return(-2);
+  }
+  for (;;) {
-  /* read next lang id and string table size in file */
+    /* read next lang id and string table size in file */
-  while (FREAD(fd, buff16, 4) == 4) {
+    if (FREAD(fd, buff16, 4) != 4) {
+      FCLOSE(fd);
+      return(-3);
+    }
     /* is it the lang I am looking for? */
-    if (buff16[0] != langid) { /* skip to next lang */
+    if (buff16[0] == langid) break;
-      FSEEK(fd, svarlang_string_count * 4);
-      FSEEK(fd, buff16[1]);
-      continue;
-    }
-    /* found - but do I have enough memory space? */
+    /* skip to next lang */
-    if (buff16[1] >= svarlang_memsz) {
+    FSEEK(fd, svarlang_string_count * 4);
-      FCLOSE(fd);
-      return(-4);
+    FSEEK(fd, buff16[1]);
-    }
+  }
-    /* load dictionary & strings */
+  /* found - but do I have enough memory space? */
-    if ((FREAD(fd, svarlang_dict, svarlang_string_count * 4) != svarlang_string_count * 4) ||
-       (FREAD(fd, svarlang_mem, buff16[1]) != buff16[1])) {
+  if (buff16[1] >= svarlang_memsz) {
-      FCLOSE(fd);
+    FCLOSE(fd);
-      return(-7);
+    return(-4);
-    }
+  }
+  /* load dictionary & strings */
+  if ((FREAD(fd, svarlang_dict, svarlang_string_count * 4) != svarlang_string_count * 4) ||
+     (FREAD(fd, svarlang_mem, buff16[1]) != buff16[1])) {
     FCLOSE(fd);
-    return(0);
+    return(-5);
+  }
   FCLOSE(fd);
-  return(-5);
+  return(0);
+}

Subversion Repositories SvarDOS

(root)/svarlang.lib/trunk/svarlang.c – Rev 1373 → 1374