ongoing config.c cleanup: getid()

src/kernel/config.c

@@ -1218,16 +1218,6 @@ typedef struct param {
     char *data;
 } param;
 
-int getid(void)
-{
-    const char *str = getstrtoken();
-    int i = str ? atoi36(str) : 0;
-    if (i < 0) {
-        return -1;
-    }
-    return i;
-}
-
 const char *get_param(const struct param *p, const char *key)
 {
     while (p != NULL) {

src/kernel/config.h

@@ -119,12 +119,8 @@ extern "C" {
     bool isparam(const char *s, const struct locale * lang, param_t param);
     param_t getparam(const struct locale *lang);
 
-    int getid(void);
 #define unitid(x) itoa36((x)->no)
 
-#define getshipid() getid()
-#define getfactionid() getid()
-
 #define buildingid(x) itoa36((x)->no)
 #define shipid(x) itoa36((x)->no)
 #define factionid(x) itoa36((x)->no)

src/util/parser.c

@@ -1,6 +1,7 @@
 #include <platform.h>
 #include "parser.h"
 #include "unicode.h"
+#include "base36.h"
 #include "log.h"
 
 #include <assert.h>
@@ -200,3 +201,13 @@ const char *getstrtoken(void)
 {
   return parse_token((const char **)&states->current_token);
 }
+
+int getid(void)
+{
+    const char *str = getstrtoken();
+    int i = str ? atoi36(str) : 0;
+    if (i < 0) {
+        return -1;
+    }
+    return i;
+}

src/util/parser.h

@@ -14,13 +14,16 @@
 extern "C" {
 #endif
 
-  extern void init_tokens_str(const char *initstr, char *cmd);  /* initialize token parsing, take ownership of cmd */
+  void init_tokens_str(const char *initstr, char *cmd);  /* initialize token parsing, take ownership of cmd */
-  extern void skip_token(void);
+  void skip_token(void);
-  extern const char *parse_token(const char **str);
+  const char *parse_token(const char **str);
-  extern void parser_pushstate(void);
+  void parser_pushstate(void);
-  extern void parser_popstate(void);
+  void parser_popstate(void);
-  extern bool parser_end(void);
+  bool parser_end(void);
-  extern const char *getstrtoken(void);
+  const char *getstrtoken(void);
+  int getid(void);
+#define getshipid() getid()
+#define getfactionid() getid()
 
 #ifdef __cplusplus
 }