Changeset 15e50b0 in git

Timestamp:

15/01/14 06:15:16 (6 years ago)

Author:

Olly Betts <olly@…>

Branches:

line_contents, master, stereo, travis-osx

Children:

53966d3

Parents:

3d3fb6c

git-author:

Olly Betts <olly@…> (15/01/14 06:14:20)

git-committer:

Olly Betts <olly@…> (15/01/14 06:15:16)

Message:

src/img.c: Simplify reading of labels in 3d v1 and v2 files.

Files:

• ChangeLog (modified) (1 diff)
• src/img.c (modified) (3 diffs)

ChangeLog

@@ +1 @@
+Wed Jan 15 06:13:44 GMT 2014  Olly Betts <olly@survex.com>
+
+        * src/img.c: Simplify reading of labels in 3d v1 and v2 files.
+
 Wed Jan 15 06:11:12 GMT 2014  Olly Betts <olly@survex.com>
 

src/img.c

@@ -1627 +1627 @@
    long opt;
 
+   again: /* label to goto if we get a cross */
    pimg->label = pimg->label_buf;
-
-   again: /* label to goto if we get a cross */
    pimg->label[0] = '\0';
 
@@ -1663 +1662 @@
       goto again;
     case 2: case 3: {
-      char *q;
-      int ch;
+      size_t len;
       result = img_LABEL;
-      ch = GETC(pimg->fh);
-      if (ch == EOF) {
+      if (!fgets(pimg->label_buf, pimg->buf_len, pimg->fh)) {
          img_errno = feof(pimg->fh) ? IMG_BADFORMAT : IMG_READERROR;
          return img_BAD;
       }
-      if (ch != '\\') ungetc(ch, pimg->fh);
-      fgets(pimg->label_buf, pimg->buf_len, pimg->fh);
-      if (feof(pimg->fh)) {
+      if (pimg->label[0] == '\\') pimg->label++;
+      len = strlen(pimg->label);
+      if (len == 0 || pimg->label[len - 1] != '\n') {
          img_errno = IMG_BADFORMAT;
          return img_BAD;
       }
-      if (ferror(pimg->fh)) {
-         img_errno = IMG_READERROR;
-         return img_BAD;
-      }
-      q = pimg->label_buf + strlen(pimg->label_buf) - 1;
-      if (*q != '\n') {
-         img_errno = IMG_BADFORMAT;
-         return img_BAD;
-      }
       /* Ignore empty labels in some .3d files (caused by a bug) */
-      if (q == pimg->label_buf) goto again;
-      *q = '\0';
+      if (len == 1) goto again;
+      pimg->label[len - 1] = '\0';
       pimg->flags = img_SFLAG_UNDERGROUND; /* no flags given... */
       if (opt == 2) goto done;
@@ -1766 +1754 @@
 
    if (result == img_LABEL && pimg->survey_len) {
-      if (strncmp(pimg->label_buf, pimg->survey, pimg->survey_len + 1) != 0)
+      if (strncmp(pimg->label, pimg->survey, pimg->survey_len + 1) != 0)
          goto again;
       pimg->label += pimg->survey_len + 1;