Mercurial > hg > batmud > maputils

changeset 1497:80df857831e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename enums.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Feb 2015 03:02:23 +0200
parents 3c9d1bf7a8d2
children a3527785dac3
files liblocfile.c
diffstat 1 files changed, 59 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/liblocfile.c	Sat Feb 07 03:00:46 2015 +0200
+++ b/liblocfile.c	Sat Feb 07 03:02:23 2015 +0200
@@ -321,13 +321,13 @@
 
 enum
 {
-    STATE_IDLE,
-    STATE_FIELD,
-    STATE_FIELD_SEP,
-    STATE_COMMENT,
-    STATE_NEXT,
-    STATE_END,
-    STATE_ERROR
+    PM_IDLE,
+    PM_FIELD,
+    PM_FIELD_SEP,
+    PM_COMMENT,
+    PM_NEXT,
+    PM_EOF,
+    PM_ERROR
 };
 
 
@@ -335,7 +335,7 @@
 {
     if (f->ch == '\n' || f->ch == '\r')
     {
-        *state = STATE_ERROR;
+        *state = PM_ERROR;
         THERR("Unexpected EOL on line #%d of '%s'.\n",
             f->lineNum, f->filename);
         return FALSE;
@@ -357,8 +357,8 @@
     /* Parse data */
     memset(tmpLocNames, 0, sizeof(tmpLocNames));
     memset(tmpCoderNames, 0, sizeof(tmpCoderNames));
-    state = STATE_IDLE;
-    next = prev = STATE_ERROR;
+    state = PM_IDLE;
+    next = prev = PM_ERROR;
     field = subfield = sep = -1;
     res = FALSE;
     f->ch = fgetc(f->fp);
@@ -366,9 +366,9 @@
     {
         switch (state)
         {
-        case STATE_IDLE:
+        case PM_IDLE:
             if (f->ch == EOF)
-                state = STATE_END;
+                state = PM_EOF;
             else if (f->ch == '\r')
             {
                 f->lineNum++;
@@ -384,13 +384,13 @@
             else if (f->ch == '#')
             {
                 prev = state;
-                state = STATE_COMMENT;
-                next = STATE_IDLE;
+                state = PM_COMMENT;
+                next = PM_IDLE;
             }
             else if (isdigit(f->ch))
             {
                 /* Start of a record */
-                state = STATE_FIELD;
+                state = PM_FIELD;
                 field = 1;
             }
             else if (isspace(f->ch))
@@ -400,13 +400,13 @@
             else
             {
                 /* Syntax error */
-                state = STATE_ERROR;
+                state = PM_ERROR;
                 THERR("Syntax error in '%s' line #%d.\n",
                     f->filename, f->lineNum);
             }
             break;
 
-        case STATE_COMMENT:
+        case PM_COMMENT:
             switch (f->ch)
             {
             case '\r':
@@ -424,7 +424,7 @@
                 state = next;
                 break;
             case EOF:
-                state = STATE_END;
+                state = PM_EOF;
                 break;
             default:
                 f->ch = fgetc(f->fp);
@@ -450,7 +450,7 @@
                                  "Refusing to read due to potential incompatibilities. If you neverthless "
                                  "wish to proceed, change the loc file's version to match internal version.\n",
                                  verMajor, verMinor, LOC_VERSION_MAJOR, LOC_VERSION_MINOR);
-                            state = STATE_ERROR;
+                            state = PM_ERROR;
                         }
                         else if (verMinor != LOC_VERSION_MINOR)
                         {
@@ -463,7 +463,7 @@
                     {
                         THERR("Invalid or malformed LOC file, version not found (%s).\n",
                              verStr);
-                        state = STATE_ERROR;
+                        state = PM_ERROR;
                     }
                     th_free(verStr);
                 }
@@ -471,7 +471,7 @@
                 {
                     THERR("Invalid LOC file, the file ID is missing ('# %s (version %d.%d)' should be the first line.)\n",
                         LOC_MAGIC, LOC_VERSION_MAJOR, LOC_VERSION_MINOR);
-                    state = STATE_ERROR;
+                    state = PM_ERROR;
                 }
                 th_free(tmp);
                 versionSet = TRUE;
@@ -479,11 +479,11 @@
             }
             break;
 
-        case STATE_NEXT:
+        case PM_NEXT:
             switch (f->ch)
             {
             case EOF:
-                state = STATE_ERROR;
+                state = PM_ERROR;
                 THERR("Unexpected end of file on line #%d of '%s'.\n",
                       f->lineNum, f->filename);
                 break;
@@ -496,7 +496,7 @@
                 i = fgetc(f->fp);
                 if (i != '\n' && i != '\r')
                 {
-                    state = STATE_ERROR;
+                    state = PM_ERROR;
                     THERR("Expected EOL on line #%d of '%s'.\n",
                           f->lineNum, f->filename);
                 }
@@ -515,24 +515,24 @@
             }
             break;
 
-        case STATE_FIELD_SEP:
+        case PM_FIELD_SEP:
             if (strchr(fieldsep, f->ch) != NULL)
             {
                 sep = f->ch;
                 f->ch = fgetc(f->fp);
                 prev = state;
-                next = STATE_FIELD;
-                state = STATE_NEXT;
+                next = PM_FIELD;
+                state = PM_NEXT;
             }
             else
             {
-                state = STATE_ERROR;
+                state = PM_ERROR;
                 THERR("Expected field separator '%s', got '%c' on line #%d of '%s'.\n",
                     fieldsep, f->ch, f->lineNum, f->filename);
             }
             break;
 
-        case STATE_FIELD:
+        case PM_FIELD:
             if (field > 0 && field < 8 && !checkForEOL(f, &state))
                 break;
             switch (field)
@@ -544,8 +544,8 @@
                 {
                     field++;
                     prev = state;
-                    next = STATE_FIELD_SEP;
-                    state = STATE_NEXT;
+                    next = PM_FIELD_SEP;
+                    state = PM_NEXT;
                 }
                 break;
 
@@ -555,8 +555,8 @@
                 {
                     field++;
                     prev = state;
-                    next = STATE_FIELD_SEP;
-                    state = STATE_NEXT;
+                    next = PM_FIELD_SEP;
+                    state = PM_NEXT;
                 }
                 break;
 
@@ -568,8 +568,8 @@
                 {
                     field++;
                     prev = state;
-                    next = STATE_FIELD_SEP;
-                    state = STATE_NEXT;
+                    next = PM_FIELD_SEP;
+                    state = PM_NEXT;
                 }
                 break;
 
@@ -588,11 +588,11 @@
                         tmpLocNames[subfield++] =
                             parseFieldString(f, fieldsep);
                         prev = state;
-                        next = STATE_FIELD_SEP;
-                        state = STATE_NEXT;
+                        next = PM_FIELD_SEP;
+                        state = PM_NEXT;
                         if (!strchr(fieldsep, f->ch))
                         {
-                            state = STATE_ERROR;
+                            state = PM_ERROR;
                             THERR
                                 ("Expected field separator '%s' after LOCNAMES on line #%d of '%s'.\n",
                                  fieldsep, f->lineNum, f->filename);
@@ -600,7 +600,7 @@
                     }
                     else
                     {
-                        state = STATE_ERROR;
+                        state = PM_ERROR;
                         THERR
                             ("Too many location names (max %d) on line #%d of '%s'.\n",
                              LOC_MAX_NAMES, f->lineNum, f->filename);
@@ -612,7 +612,7 @@
                     subfield = -1;
                     field++;
                     prev = state;
-                    state = STATE_FIELD;
+                    state = PM_FIELD;
                 }
                 break;
 
@@ -631,11 +631,11 @@
                         tmpCoderNames[subfield++] =
                             parseFieldString(f, fieldsep);
                         prev = state;
-                        next = STATE_FIELD_SEP;
-                        state = STATE_NEXT;
+                        next = PM_FIELD_SEP;
+                        state = PM_NEXT;
                         if (!strchr(fieldsep, f->ch))
                         {
-                            state = STATE_ERROR;
+                            state = PM_ERROR;
                             THERR
                                 ("Expected field separator '%s' after CODERNAMES on line #%d of '%s'.\n",
                                  fieldsep, f->lineNum, f->filename);
@@ -643,7 +643,7 @@
                     }
                     else
                     {
-                        state = STATE_ERROR;
+                        state = PM_ERROR;
                         THERR
                             ("Too many coder names (max %d) on line #%d of '%s'.\n",
                              LOC_MAX_NAMES, f->lineNum, f->filename);
@@ -655,7 +655,7 @@
                     subfield = -1;
                     field++;
                     prev = state;
-                    state = STATE_FIELD;
+                    state = PM_FIELD;
                 }
                 break;
 
@@ -673,12 +673,12 @@
                         THERR
                             ("Warning, invalid timestamp '%s' in '%s' (line #%d in '%s')\n",
                              tmpStr, tmpLocNames[0], f->lineNum, f->filename);
-                        state = STATE_ERROR;
+                        state = PM_ERROR;
                     }
                 }
                 if (!strchr(fieldsep, f->ch))
                 {
-                    state = STATE_ERROR;
+                    state = PM_ERROR;
                     THERR
                         ("Expected field separator '%s' after DATE on line #%d of '%s'.\n",
                          fieldsep, f->lineNum, f->filename);
@@ -687,8 +687,8 @@
                 {
                     field++;
                     prev = state;
-                    next = STATE_FIELD_SEP;
-                    state = STATE_NEXT;
+                    next = PM_FIELD_SEP;
+                    state = PM_NEXT;
                 }
                 th_free(tmpStr);
                 break;
@@ -698,8 +698,8 @@
                 tmpURI = parseFieldString(f, fieldsep);
                 field++;
                 prev = state;
-                next = STATE_FIELD_SEP;
-                state = STATE_NEXT;
+                next = PM_FIELD_SEP;
+                state = PM_NEXT;
                 break;
 
             case 8:            /* Freeform */
@@ -711,7 +711,7 @@
                     THERR
                         ("Invalid X or Y coordinate (%d, %d), for location '%s' on line #%d of '%s'. Must be > 0.\n",
                          tmpX, tmpY, tmpLocNames[0], f->lineNum, f->filename);
-                    state = STATE_ERROR;
+                    state = PM_ERROR;
                 }
 
                 /* Check if location already exists */
@@ -727,7 +727,7 @@
                         ("Warning, location already in list! (%d,%d) '%s' <-> (%d,%d) '%s'\n",
                          tloc->x, tloc->y, tloc->names[0].name, tmpX, tmpY,
                          tmpLocNames[0]);
-                    state = STATE_ERROR;
+                    state = PM_ERROR;
                 }
                 else
                 {
@@ -736,7 +736,7 @@
                               tmpLocNames, tmpCoderNames, &tmpTime,
                               tmpTimeSet, tmpURI, tmpStr, f);
                     prev = state;
-                    state = STATE_IDLE;
+                    state = PM_IDLE;
                 }
                 for (i = 0; i < LOC_MAX_NAMES; i++)
                 {
@@ -749,11 +749,11 @@
 
             default:
                 THERR("FATAL ERROR! Invalid state=%d!\n", state);
-                state = STATE_ERROR;
+                state = PM_ERROR;
             }
             if (!res)
             {
-                state = STATE_ERROR;
+                state = PM_ERROR;
                 THERR("Error parsing field %d on line #%d of '%s'.\n",
                     field, f->lineNum, f->filename);
             }
@@ -762,11 +762,11 @@
         default:
             THERR("Invalid state in loc-file parser - state=%d, prev=%d, next=%d, lineNum=%d, file='%s'.\n",
                 state, prev, next, f->lineNum, f->filename);
-            state = STATE_ERROR;
+            state = PM_ERROR;
             break;
         }
     }
-    while (state != STATE_ERROR && state != STATE_END);
+    while (state != PM_ERROR && state != PM_EOF);
 
     for (i = 0; i < LOC_MAX_NAMES; i++)
     {
@@ -775,7 +775,7 @@
     }
     th_free(tmpURI);
 
-    return (state == STATE_END);
+    return (state == PM_EOF);
 }