Mercurial > hg > batmud > maputils

changeset 1496:3c9d1bf7a8d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some struct members.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Feb 2015 03:00:46 +0200
parents 86a2eb46f7e7
children 80df857831e8
files liblocfile.c liblocfile.h mkcitymap.c mkloc.c
diffstat 4 files changed, 59 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/liblocfile.c	Sat Feb 07 02:43:12 2015 +0200
+++ b/liblocfile.c	Sat Feb 07 03:00:46 2015 +0200
@@ -165,13 +165,15 @@
 static BOOL parseFieldInt(LocFileInfo *f, int *val)
 {
     int res = 0;
-    if (!isdigit(f->c))
+
+    if (!isdigit(f->ch))
         return FALSE;
-    while (isdigit(f->c))
+
+    while (isdigit(f->ch))
     {
         res *= 10;
-        res += f->c - '0';
-        f->c = fgetc(f->f);
+        res += f->ch - '0';
+        f->ch = fgetc(f->fp);
     }
     *val = res;
     return TRUE;
@@ -185,12 +187,12 @@
     size_t pos = 0;
     int i;
 
-    if (strchr(endch, f->c))
+    if (strchr(endch, f->ch))
         return NULL;
 
-    while (!end && !strchr(endch, f->c) && pos < sizeof(res) - 1)
+    while (!end && !strchr(endch, f->ch) && pos < sizeof(res) - 1)
     {
-        switch (f->c)
+        switch (f->ch)
         {
         case '\n':
         case '\r':
@@ -205,7 +207,7 @@
             break;
         case '\\':
             /* Enable continuation via '\' at EOL */
-            i = fgetc(f->f);
+            i = fgetc(f->fp);
             if (i == EOF)
             {
                 THERR
@@ -215,19 +217,19 @@
             }
             else if (i == '\n' || i == '\r')
             {
-                f->c = fgetc(f->f);
-                if (i == '\r' && f->c == '\n')
-                    f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
+                if (i == '\r' && f->ch == '\n')
+                    f->ch = fgetc(f->fp);
             }
             else
             {
                 res[pos++] = i;
-                f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
             }
             break;
         default:
-            res[pos++] = f->c;
-            f->c = fgetc(f->f);
+            res[pos++] = f->ch;
+            f->ch = fgetc(f->fp);
             break;
         }
     }
@@ -249,7 +251,7 @@
     endFlags = FALSE;
     while (!endFlags)
     {
-        switch (f->c)
+        switch (f->ch)
         {
             /* Scenic marker flags */
         case '?':
@@ -310,9 +312,7 @@
         }
 
         if (!endFlags)
-        {
-            f->c = fgetc(f->f);
-        }
+            f->ch = fgetc(f->fp);
     }
 
     return TRUE;
@@ -333,7 +333,7 @@
 
 static BOOL checkForEOL(LocFileInfo *f, int *state)
 {
-    if (f->c == '\n' || f->c == '\r')
+    if (f->ch == '\n' || f->ch == '\r')
     {
         *state = STATE_ERROR;
         THERR("Unexpected EOL on line #%d of '%s'.\n",
@@ -361,41 +361,41 @@
     next = prev = STATE_ERROR;
     field = subfield = sep = -1;
     res = FALSE;
-    f->c = fgetc(f->f);
+    f->ch = fgetc(f->fp);
     do
     {
         switch (state)
         {
         case STATE_IDLE:
-            if (f->c == EOF)
+            if (f->ch == EOF)
                 state = STATE_END;
-            else if (f->c == '\r')
+            else if (f->ch == '\r')
             {
                 f->lineNum++;
-                f->c = fgetc(f->f);
-                if (f->c == '\n')
-                    f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
+                if (f->ch == '\n')
+                    f->ch = fgetc(f->fp);
             }
-            else if (f->c == '\n')
+            else if (f->ch == '\n')
             {
                 f->lineNum++;
-                f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
             }
-            else if (f->c == '#')
+            else if (f->ch == '#')
             {
                 prev = state;
                 state = STATE_COMMENT;
                 next = STATE_IDLE;
             }
-            else if (isdigit(f->c))
+            else if (isdigit(f->ch))
             {
                 /* Start of a record */
                 state = STATE_FIELD;
                 field = 1;
             }
-            else if (isspace(f->c))
+            else if (isspace(f->ch))
             {
-                f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
             }
             else
             {
@@ -407,18 +407,18 @@
             break;
 
         case STATE_COMMENT:
-            switch (f->c)
+            switch (f->ch)
             {
             case '\r':
-                f->c = fgetc(f->f);
-                if (f->c == '\n')
-                    f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
+                if (f->ch == '\n')
+                    f->ch = fgetc(f->fp);
                 f->lineNum++;
                 prev = state;
                 state = next;
                 break;
             case '\n':
-                f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
                 f->lineNum++;
                 prev = state;
                 state = next;
@@ -427,12 +427,12 @@
                 state = STATE_END;
                 break;
             default:
-                f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
 
                 /* Because loc file identification should be the first
                  * comment line, we check it here.
                  */
-                if (versionSet || !isalpha(f->c))
+                if (versionSet || !isalpha(f->ch))
                     break;
 
                 char *tmp = parseFieldString(f, "(\n\r");
@@ -480,7 +480,7 @@
             break;
 
         case STATE_NEXT:
-            switch (f->c)
+            switch (f->ch)
             {
             case EOF:
                 state = STATE_ERROR;
@@ -489,11 +489,11 @@
                 break;
             case 32:
             case 9:
-                f->c = fgetc(f->f);
+                f->ch = fgetc(f->fp);
                 break;
             case '\\':
                 /* Enable continuation via '\' at EOL */
-                i = fgetc(f->f);
+                i = fgetc(f->fp);
                 if (i != '\n' && i != '\r')
                 {
                     state = STATE_ERROR;
@@ -503,9 +503,9 @@
                 else
                 {
                     f->lineNum++;
-                    f->c = fgetc(f->f);
-                    if (i == '\r' && f->c == '\n')
-                        f->c = fgetc(f->f);
+                    f->ch = fgetc(f->fp);
+                    if (i == '\r' && f->ch == '\n')
+                        f->ch = fgetc(f->fp);
                 }
                 break;
             default:
@@ -516,10 +516,10 @@
             break;
 
         case STATE_FIELD_SEP:
-            if (strchr(fieldsep, f->c) != NULL)
+            if (strchr(fieldsep, f->ch) != NULL)
             {
-                sep = f->c;
-                f->c = fgetc(f->f);
+                sep = f->ch;
+                f->ch = fgetc(f->fp);
                 prev = state;
                 next = STATE_FIELD;
                 state = STATE_NEXT;
@@ -528,7 +528,7 @@
             {
                 state = STATE_ERROR;
                 THERR("Expected field separator '%s', got '%c' on line #%d of '%s'.\n",
-                    fieldsep, f->c, f->lineNum, f->filename);
+                    fieldsep, f->ch, f->lineNum, f->filename);
             }
             break;
 
@@ -590,7 +590,7 @@
                         prev = state;
                         next = STATE_FIELD_SEP;
                         state = STATE_NEXT;
-                        if (!strchr(fieldsep, f->c))
+                        if (!strchr(fieldsep, f->ch))
                         {
                             state = STATE_ERROR;
                             THERR
@@ -633,7 +633,7 @@
                         prev = state;
                         next = STATE_FIELD_SEP;
                         state = STATE_NEXT;
-                        if (!strchr(fieldsep, f->c))
+                        if (!strchr(fieldsep, f->ch))
                         {
                             state = STATE_ERROR;
                             THERR
@@ -676,7 +676,7 @@
                         state = STATE_ERROR;
                     }
                 }
-                if (!strchr(fieldsep, f->c))
+                if (!strchr(fieldsep, f->ch))
                 {
                     state = STATE_ERROR;
                     THERR
@@ -832,7 +832,7 @@
     f->filename = th_strdup(filename);
     f->continent = th_strdup(continent);
     f->x = f->y = 0;
-    f->f = NULL;
+    f->fp = NULL;
     f->lineNum = 1;
-    f->c = -1;
+    f->ch = -1;
 }
--- a/liblocfile.h	Sat Feb 07 02:43:12 2015 +0200
+++ b/liblocfile.h	Sat Feb 07 03:00:46 2015 +0200
@@ -90,9 +90,9 @@
     char *continent;
     int x, y;
 
-    FILE *f;
+    FILE *fp;
     size_t lineNum;
-    int c;
+    int ch;
 } LocFileInfo;
 
 
--- a/mkcitymap.c	Sat Feb 07 02:43:12 2015 +0200
+++ b/mkcitymap.c	Sat Feb 07 03:00:46 2015 +0200
@@ -420,7 +420,7 @@
     
     /* Parse location file */
     setFileInfo(&locFile, optLocFilename, NULL);
-    if ((locFile.f = fopen(locFile.filename, "rb")) == NULL)
+    if ((locFile.fp = fopen(locFile.filename, "rb")) == NULL)
     {
         THERR("Could not open location file '%s' for reading.\n",
             locFile.filename);
@@ -430,7 +430,7 @@
     if (!locParseLocStream(&locFile, &locations, locFile.x, locFile.y))
         exit(1);
     
-    fclose(locFile.f);
+    fclose(locFile.fp);
 
     /* Open mapfile */
     map = mapBlockParseFile(optMapFilename, FALSE);
--- a/mkloc.c	Sat Feb 07 02:43:12 2015 +0200
+++ b/mkloc.c	Sat Feb 07 03:00:46 2015 +0200
@@ -1098,7 +1098,7 @@
         }
 
         THMSG(2, "Reading location info '%s'\n", f->filename);
-        if ((f->f = fopen(f->filename, "rb")) == NULL)
+        if ((f->fp = fopen(f->filename, "rb")) == NULL)
         {
             THERR("Could not open location file '%s' for reading.\n",
                 f->filename);
@@ -1108,7 +1108,7 @@
         if (!locParseLocStream(f, &worldLoc, f->x, f->y))
             exit(1);
         
-        fclose(f->f);
+        fclose(f->fp);
     }
     
     /* Update locations */