Move xdmeta() back to commands/xdump.c, internal linkage

Partially revert commit 4c746b5e.

diff --git a/include/xdump.h b/include/xdump.h
index 333ba83ed16b5f930631d4684f01818877efa42f..e5e6242ebd4843695eec24554843e9f0b86b7a1b 100644 (file)
--- a/include/xdump.h
+++ b/include/xdump.h
@@ -51,7 +51,6 @@ extern void xdhdr(struct xdstr *, char *, int);
 extern void xdcolhdr(struct xdstr *, struct castr[]);
 extern void xdflds(struct xdstr *, struct castr[], void *);
 extern void xdftr(struct xdstr *, int);
-extern int xdmeta(struct xdstr *, int);
 extern int xundump(FILE *, char *, int *, int);
 
 #endif

diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c
index 2001f885ebedee418cbe87c689e32bb529bbf0f9..d758b1d334d344f87da06f480661b3149caf495f 100644 (file)
--- a/src/lib/commands/xdump.c
+++ b/src/lib/commands/xdump.c
@@ -113,6 +113,38 @@ xdvisible(int type, void *p)
     }
 }
 
+/*
+ * Dump meta-data for items of type TYPE to XD.
+ * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
+ */
+static int
+xdmeta(struct xdstr *xd, int type)
+{
+    struct castr *ca = ef_cadef(type);
+    int i;
+    int n = 0;
+
+    if (!ca)
+       return RET_SYN;
+
+    xdhdr(xd, ef_nameof(type), 1);
+    xdcolhdr(xd, ca);
+
+    for (i = 0; ca[i].ca_name; i++) {
+       if (ca[i].ca_flags & NSC_DEITY && !xd->divine)
+           continue;
+       if (ca[i].ca_flags & NSC_EXTRA)
+           continue;
+       xdflds(xd, mdchr_ca, &ca[i]);
+       xd->pr("\n");
+       n++;
+    }
+
+    xdftr(xd, n);
+
+    return RET_OK;
+}
+
 /*
  * Dump items of type TYPE selected by ARG to XD.
  * Return RET_OK on success, RET_SYN on error.

diff --git a/src/lib/common/xdump.c b/src/lib/common/xdump.c
index 5c214043d9e606c06565a4d1496acefec64b618f..33a37837a60949f5045ab89dfb1428aaa73a14dc 100644 (file)
--- a/src/lib/common/xdump.c
+++ b/src/lib/common/xdump.c
@@ -307,35 +307,3 @@ xdftr(struct xdstr *xd, int n)
     else
        xd->pr("/%d\n", n);
 }
-
-/*
- * Dump meta-data for items of type TYPE to XD.
- * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
- */
-int
-xdmeta(struct xdstr *xd, int type)
-{
-    struct castr *ca = ef_cadef(type);
-    int i;
-    int n = 0;
-
-    if (!ca)
-       return RET_SYN;
-
-    xdhdr(xd, ef_nameof(type), 1);
-    xdcolhdr(xd, ca);
-
-    for (i = 0; ca[i].ca_name; i++) {
-       if (ca[i].ca_flags & NSC_DEITY && !xd->divine)
-           continue;
-       if (ca[i].ca_flags & NSC_EXTRA)
-           continue;
-       xdflds(xd, mdchr_ca, &ca[i]);
-       xd->pr("\n");
-       n++;
-    }
-
-    xdftr(xd, n);
-
-    return RET_OK;
-}