Mercurial > hg > batmud > maputils

changeset 2219:6ad44b2630d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename locGetType() to locGetTypePrefix() and locGetLocationType() to locGetTypeName().
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 21 Oct 2019 03:44:06 +0300
parents 9674d75c7ae1
children 312b4ca781aa
files liblocfile.c liblocfile.h mkloc.c
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/liblocfile.c	Thu Oct 17 03:38:02 2019 +0300
+++ b/liblocfile.c	Mon Oct 21 03:44:06 2019 +0300
@@ -769,7 +769,7 @@
 }
 
 
-const char *locGetType(int flags)
+const char *locGetTypePrefix(const int flags)
 {
     switch (flags & LOCF_M_MASK)
     {
@@ -793,7 +793,7 @@
 }
 
 
-const char *locGetLocationType(int flags)
+const char *locGetTypeName(const int flags)
 {
     switch (flags & LOCF_M_MASK)
     {
--- a/liblocfile.h	Thu Oct 17 03:38:02 2019 +0300
+++ b/liblocfile.h	Mon Oct 21 03:44:06 2019 +0300
@@ -150,8 +150,8 @@
 
 int    locFindByCoords(const MapLocations *l, const int x, const int y, const BOOL locTrue);
 
-const char * locGetType(int flags);
-const char * locGetLocationType(int flags);
+const char * locGetTypePrefix(const int flags);
+const char * locGetTypeName(const int flags);
 
 LocMarker *locCopyLocMarker(const LocMarker *);
 void   locCopyLocations(MapLocations *dst, const MapLocations *src);
--- a/mkloc.c	Thu Oct 17 03:38:02 2019 +0300
+++ b/mkloc.c	Mon Oct 21 03:44:06 2019 +0300
@@ -252,7 +252,7 @@
 
 int locPrintType(FILE *outFile, LocMarker *loc, BOOL adjust, int (*func)(const char *, FILE *), BOOL label)
 {
-    const char *type = locGetType(loc->flags);
+    const char *type = locGetTypePrefix(loc->flags);
     int len = 0;
 
     if (type != NULL && label)
@@ -1043,7 +1043,8 @@
         }
 
         // Type of the marker
-        fprintf(outFile, " type=\"%s\"/>\n", locGetLocationType(tmp->flags));
+        fprintf(outFile, " type=\"%s\"/>\n",
+            locGetTypeName(tmp->flags));
     }
 
     fprintf(outFile, "</markers>\n");