Avoid linker conflicts on DescribeFoo symbols

These symbols belong to the user. It caused a confusing error for Blink.

libc/calls/groups.internal.h

@@ -5,9 +5,9 @@ COSMOPOLITAN_C_START_
 int sys_getgroups(int size, uint32_t list[]);
 int sys_setgroups(size_t size, const uint32_t list[]);
 
-const char *DescribeGidList(char[128], int, int, const uint32_t list[]);
+const char *_DescribeGidList(char[128], int, int, const uint32_t list[]);
 #define DescribeGidList(rc, length, gidlist) \
-  DescribeGidList(alloca(128), rc, length, gidlist)
+  _DescribeGidList(alloca(128), rc, length, gidlist)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_GROUPS_INTERNAL_H_ */

libc/calls/printfds.c

@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/intrin/fds.h"
 #include "libc/intrin/describeflags.h"
+#include "libc/intrin/fds.h"
 #include "libc/intrin/kprintf.h"
 
 static const char *__fdkind2str(int x) {
@@ -55,7 +55,7 @@ void __printfds(struct Fd *fds, size_t fdslen) {
       continue;
     kprintf("%3d %s", i, __fdkind2str(fds[i].kind));
     if (fds[i].flags) {
-      kprintf(" flags=%s", (DescribeOpenFlags)(buf, fds[i].flags));
+      kprintf(" flags=%s", _DescribeOpenFlags(buf, fds[i].flags));
     }
     if (fds[i].mode)
       kprintf(" mode=%#o", fds[i].mode);

libc/calls/seccomp.c

@@ -82,7 +82,7 @@ int seccomp(unsigned operation, unsigned flags, void *args) {
   } else {
     rc = enosys();
   }
-  STRACE("seccomp(%s, %#x, %p) → %d% m", DescribeSeccompOperation(operation),
+  STRACE("seccomp(%s, %#x, %p) → %d% m", _DescribeSeccompOperation(operation),
          flags, args, rc);
   return rc;
 }

libc/calls/sig.c

@@ -194,7 +194,7 @@ textwindows int __sig_raise(volatile int sig, int sic) {
     char ssbuf[128];
     siginfo_t si = {.si_signo = sig, .si_code = sic};
     STRACE("__sig_raise(%G, %t) mask %s", sig, __sig_handler(rva),
-           (DescribeSigset)(ssbuf, 0, (sigset_t *)&pt->tib->tib_sigmask));
+           _DescribeSigset(ssbuf, 0, (sigset_t *)&pt->tib->tib_sigmask));
     __sig_handler(rva)(sig, &si, &ctx);
 
     // record this handler
@@ -265,8 +265,8 @@ static textwindows wontreturn void __sig_tramp(struct SignalFrame *sf) {
     // call the user's signal handler
     char ssbuf[2][128];
     STRACE("__sig_tramp(%G, %t) mask %s → %s", sig, __sig_handler(sf->rva),
-           (DescribeSigset)(ssbuf[0], 0, &sf->ctx.uc_sigmask),
-           (DescribeSigset)(ssbuf[1], 0, (sigset_t *)&tib->tib_sigmask));
+           _DescribeSigset(ssbuf[0], 0, &sf->ctx.uc_sigmask),
+           _DescribeSigset(ssbuf[1], 0, (sigset_t *)&tib->tib_sigmask));
     __sig_handler(sf->rva)(sig, &sf->si, &sf->ctx);
 
     // restore the signal mask that was used by the interrupted code

libc/calls/struct/flock.internal.h

@@ -4,8 +4,8 @@
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
 
-const char *DescribeFlock(char[300], int, const struct flock *);
-#define DescribeFlock(c, l) DescribeFlock(alloca(300), c, l)
+const char *_DescribeFlock(char[300], int, const struct flock *);
+#define DescribeFlock(c, l) _DescribeFlock(alloca(300), c, l)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FLOCK_INTERNAL_H_ */

libc/calls/struct/iovec.internal.h

@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_INTERNAL_H_
-#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
+#include "libc/intrin/fds.h"
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
 
@@ -22,8 +22,8 @@ ssize_t sys_send_nt(int, const struct iovec *, size_t, uint32_t);
 ssize_t sys_sendto_nt(int, const struct iovec *, size_t, uint32_t, const void *,
                       uint32_t);
 
-const char *DescribeIovec(char[300], ssize_t, const struct iovec *, int);
-#define DescribeIovec(x, y, z) DescribeIovec(alloca(300), x, y, z)
+const char *_DescribeIovec(char[300], ssize_t, const struct iovec *, int);
+#define DescribeIovec(x, y, z) _DescribeIovec(alloca(300), x, y, z)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_INTERNAL_H_ */

libc/calls/struct/itimerval.internal.h

@@ -8,8 +8,8 @@ int sys_getitimer(int, struct itimerval *);
 int sys_setitimer(int, const struct itimerval *, struct itimerval *);
 int sys_setitimer_nt(int, const struct itimerval *, struct itimerval *);
 
-const char *DescribeItimerval(char[90], int, const struct itimerval *);
-#define DescribeItimerval(rc, ts) DescribeItimerval(alloca(90), rc, ts)
+const char *_DescribeItimerval(char[90], int, const struct itimerval *);
+#define DescribeItimerval(rc, ts) _DescribeItimerval(alloca(90), rc, ts)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_ITIMERVAL_INTERNAL_H_ */

libc/calls/struct/rlimit.internal.h

@@ -8,8 +8,8 @@ int sys_getrlimit(int, struct rlimit *);
 int sys_setrlimit(int, const struct rlimit *);
 int sys_setrlimit_nt(int, const struct rlimit *);
 
-const char *DescribeRlimit(char[64], int, const struct rlimit *);
-#define DescribeRlimit(rc, rl) DescribeRlimit(alloca(64), rc, rl)
+const char *_DescribeRlimit(char[64], int, const struct rlimit *);
+#define DescribeRlimit(rc, rl) _DescribeRlimit(alloca(64), rc, rl)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_RLIMIT_INTERNAL_H_ */

libc/calls/struct/sched_param.internal.h

@@ -4,8 +4,8 @@
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
 
-const char *DescribeSchedParam(char[32], const struct sched_param *);
-#define DescribeSchedParam(x) DescribeSchedParam(alloca(32), x)
+const char *_DescribeSchedParam(char[32], const struct sched_param *);
+#define DescribeSchedParam(x) _DescribeSchedParam(alloca(32), x)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SCHED_PARAM_INTERNAL_H_ */

libc/calls/struct/sigaction.internal.h

@@ -66,8 +66,8 @@ void __sigenter_netbsd(int, siginfo_t *, void *);
 void __sigenter_freebsd(int, siginfo_t *, void *);
 void __sigenter_openbsd(int, siginfo_t *, void *);
 
-const char *DescribeSigaction(char[256], int, const struct sigaction *);
-#define DescribeSigaction(rc, sa) DescribeSigaction(alloca(256), rc, sa)
+const char *_DescribeSigaction(char[256], int, const struct sigaction *);
+#define DescribeSigaction(rc, sa) _DescribeSigaction(alloca(256), rc, sa)
 
 void _init_onntconsoleevent(void);
 

libc/calls/struct/sigaltstack.internal.h

@@ -4,8 +4,8 @@
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
 
-const char *DescribeSigaltstack(char[128], int, const struct sigaltstack *);
-#define DescribeSigaltstack(rc, ss) DescribeSigaltstack(alloca(128), rc, ss)
+const char *_DescribeSigaltstack(char[128], int, const struct sigaltstack *);
+#define DescribeSigaltstack(rc, ss) _DescribeSigaltstack(alloca(128), rc, ss)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGALTSTACK_INTERNAL_H_ */

libc/calls/struct/siginfo.internal.h

@@ -6,8 +6,8 @@ COSMOPOLITAN_C_START_
 
 int sys_sigqueueinfo(int, const siginfo_t *);
 
-const char *DescribeSiginfo(char[300], int, const siginfo_t *);
-#define DescribeSiginfo(x, y) DescribeSiginfo(alloca(300), x, y)
+const char *_DescribeSiginfo(char[300], int, const siginfo_t *);
+#define DescribeSiginfo(x, y) _DescribeSiginfo(alloca(300), x, y)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_INTERNAL_H_ */

libc/calls/struct/sigset.internal.h

@@ -34,8 +34,8 @@ int sys_sigprocmask(int, const sigset_t *, sigset_t *);
 int sys_sigsuspend(const uint64_t *, uint64_t);
 int sys_sigpending(uint64_t *, size_t);
 
-const char *DescribeSigset(char[128], int, const sigset_t *);
-#define DescribeSigset(rc, ss) DescribeSigset(alloca(128), rc, ss)
+const char *_DescribeSigset(char[128], int, const sigset_t *);
+#define DescribeSigset(rc, ss) _DescribeSigset(alloca(128), rc, ss)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGSET_INTERNAL_H_ */

libc/calls/struct/stat.internal.h

@@ -13,8 +13,8 @@ int sys_fstatat_nt(int, const char *, struct stat *, int);
 int sys_lstat_nt(const char *, struct stat *);
 int sys_fstat_metal(int, struct stat *);
 
-const char *DescribeStat(char[300], int, const struct stat *);
-#define DescribeStat(rc, st) DescribeStat(alloca(300), rc, st)
+const char *_DescribeStat(char[300], int, const struct stat *);
+#define DescribeStat(rc, st) _DescribeStat(alloca(300), rc, st)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STAT_INTERNAL_H_ */

libc/calls/struct/statfs.internal.h

@@ -12,8 +12,8 @@ int sys_fstatfs_nt(int64_t, struct statfs *);
 int sys_statfs_nt(const char *, struct statfs *);
 void statfs2statvfs(struct statvfs *, const struct statfs *);
 
-const char *DescribeStatfs(char[300], int, const struct statfs *);
-#define DescribeStatfs(rc, sf) DescribeStatfs(alloca(300), rc, sf)
+const char *_DescribeStatfs(char[300], int, const struct statfs *);
+#define DescribeStatfs(rc, sf) _DescribeStatfs(alloca(300), rc, sf)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_INTERNAL_H_ */

libc/calls/struct/termios.internal.h

@@ -4,9 +4,9 @@
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
 
-const char *DescribeTermios(char[1024], ssize_t, const struct termios *);
+const char *_DescribeTermios(char[1024], ssize_t, const struct termios *);
 
-#define DescribeTermios(rc, tio) DescribeTermios(alloca(1024), rc, tio)
+#define DescribeTermios(rc, tio) _DescribeTermios(alloca(1024), rc, tio)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TERMIOS_INTERNAL_H_ */

libc/calls/struct/timespec.internal.h

@@ -26,8 +26,8 @@ int sys_utimensat(int, const char *, const struct timespec[2], int);
 int sys_utimensat_nt(int, const char *, const struct timespec[2], int);
 int sys_utimensat_old(int, const char *, const struct timespec[2], int);
 
-const char *DescribeTimespec(char[45], int, const struct timespec *);
-#define DescribeTimespec(rc, ts) DescribeTimespec(alloca(45), rc, ts)
+const char *_DescribeTimespec(char[45], int, const struct timespec *);
+#define DescribeTimespec(rc, ts) _DescribeTimespec(alloca(45), rc, ts)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TIMESPEC_INTERNAL_H_ */

libc/calls/struct/timeval.internal.h

@@ -11,8 +11,8 @@ int sys_lutimes(const char *, const struct timeval *);
 int sys_utimes(const char *, const struct timeval *);
 int sys_utimes_nt(const char *, const struct timeval[2]);
 
-const char *DescribeTimeval(char[45], int, const struct timeval *);
-#define DescribeTimeval(rc, ts) DescribeTimeval(alloca(45), rc, ts)
+const char *_DescribeTimeval(char[45], int, const struct timeval *);
+#define DescribeTimeval(rc, ts) _DescribeTimeval(alloca(45), rc, ts)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TIMEVAL_INTERNAL_H_ */

libc/calls/struct/winsize.internal.h

@@ -1,13 +1,13 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_INTERNAL_H_
-#include "libc/intrin/fds.h"
 #include "libc/calls/struct/winsize.h"
+#include "libc/intrin/fds.h"
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
 
 int tcgetwinsize_nt(int, struct winsize *);
-const char *DescribeWinsize(char[64], int, const struct winsize *);
-#define DescribeWinsize(rc, ws) DescribeWinsize(alloca(64), rc, ws)
+const char *_DescribeWinsize(char[64], int, const struct winsize *);
+#define DescribeWinsize(rc, ws) _DescribeWinsize(alloca(64), rc, ws)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_INTERNAL_H_ */

libc/fmt/magnumstrs.internal.h

@@ -28,7 +28,8 @@ extern const struct MagnumStr kSockOptnames[];
 extern const struct MagnumStr kTcpOptnames[];
 extern const struct MagnumStr kPollNames[];
 
-const char *DescribeMagnum(char *, const struct MagnumStr *, const char *, int);
+const char *_DescribeMagnum(char *, const struct MagnumStr *, const char *,
+                            int);
 
 __funline const char *GetMagnumStr(const struct MagnumStr *ms, int x) {
   int i;

libc/intrin/cp.c

@@ -53,7 +53,7 @@ void report_cancelation_point(int sysv_ordinal, int xnu_ordinal) {
   char bt[160];
   struct StackFrame *bp = __builtin_frame_address(0);
   kprintf("error: report_cancelation_point(%#x, %#x) %s\n", sysv_ordinal,
-          xnu_ordinal, (DescribeBacktrace)(bt, bp));
+          xnu_ordinal, _DescribeBacktrace(bt, bp));
   __builtin_trap();
 }
 

libc/intrin/createfile.c

@@ -57,11 +57,11 @@ CreateFile(const char16_t *lpFileName,                         //
                               opt_lpSecurity, dwCreationDisposition,
                               dwFlagsAndAttributes, opt_hTemplateFile);
   NTTRACE("CreateFile(%#hs, %s, %s, %s, %s, %s, %ld) → {%ld, %d}", lpFileName,
-          (DescribeNtFileAccessFlags)(buf_accessflags, dwDesiredAccess),
-          (DescribeNtFileShareFlags)(buf_shareflags, dwShareMode),
-          (DescribeNtSecurityAttributes)(buf_secattr, opt_lpSecurity),
-          DescribeNtCreationDisposition(dwCreationDisposition),
-          (DescribeNtFileFlagAttr)(buf_flagattr, dwFlagsAndAttributes),
+          _DescribeNtFileAccessFlags(buf_accessflags, dwDesiredAccess),
+          _DescribeNtFileShareFlags(buf_shareflags, dwShareMode),
+          _DescribeNtSecurityAttributes(buf_secattr, opt_lpSecurity),
+          _DescribeNtCreationDisposition(dwCreationDisposition),
+          _DescribeNtFileFlagAttr(buf_flagattr, dwFlagsAndAttributes),
           opt_hTemplateFile, hHandle, __imp_GetLastError());
   if (hHandle == -1) {
     switch (__imp_GetLastError()) {

libc/intrin/describearchprctlcode.c

@@ -21,7 +21,7 @@
 #include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/arch.h"
 
-const char *(DescribeArchPrctlCode)(char buf[12], int x) {
+const char *_DescribeArchPrctlCode(char buf[12], int x) {
   if (x == ARCH_SET_FS)
     return "ARCH_SET_FS";
   if (x == ARCH_GET_FS)

libc/intrin/describebacktrace.c

@@ -39,8 +39,8 @@ privileged static char *FormatHex(char *p, unsigned long x) {
   return p;
 }
 
-privileged dontinstrument const char *(
-    DescribeBacktrace)(char buf[N], const struct StackFrame *fr) {
+privileged dontinstrument const char *_DescribeBacktrace(
+    char buf[N], const struct StackFrame *fr) {
   char *p = buf;
   char *pe = p + N;
   bool gotsome = false;

libc/intrin/describebacktrace.h

@@ -4,8 +4,8 @@
 #include "libc/nexgen32e/stackframe.h"
 COSMOPOLITAN_C_START_
 
-const char *DescribeBacktrace(char[160], const struct StackFrame *) libcesque;
-#define DescribeBacktrace(x) DescribeBacktrace(alloca(160), x)
+const char *_DescribeBacktrace(char[160], const struct StackFrame *) libcesque;
+#define DescribeBacktrace(x) _DescribeBacktrace(alloca(160), x)
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_INTRIN_DESCRIBEBACKTRACE_H_ */

libc/intrin/describecancelstate.c

@@ -20,7 +20,7 @@
 #include "libc/intrin/describeflags.h"
 #include "libc/thread/thread.h"
 
-const char *(DescribeCancelState)(char buf[12], int err, int *state) {
+const char *_DescribeCancelState(char buf[12], int err, int *state) {
   if (err)
     return "n/a";
   if (!state)

libc/intrin/describecapability.c

@@ -69,7 +69,7 @@ static const struct thatispacked {
     {CAP_CHECKPOINT_RESTORE, "CHECKPOINT_RESTORE"},  //
 };
 
-const char *(DescribeCapability)(char buf[32], int x) {
+const char *_DescribeCapability(char buf[32], int x) {
   int i;
   for (i = 0; i < ARRAYLEN(kCapabilityName); ++i) {
     if (kCapabilityName[i].x == x) {

libc/intrin/describeclockname.c

@@ -22,6 +22,6 @@
 /**
  * Describes clock_gettime() clock argument.
  */
-const char *(DescribeClockName)(char buf[32], int x) {
-  return DescribeMagnum(buf, kClockNames, "CLOCK_", x);
+const char *_DescribeClockName(char buf[32], int x) {
+  return _DescribeMagnum(buf, kClockNames, "CLOCK_", x);
 }

libc/intrin/describecontrolkeystate.c

@@ -32,7 +32,7 @@ static const struct DescribeFlags kControlKeyState[] = {
     {kNtEnhancedKey, "EnhancedKey"},            //
 };
 
-const char *(DescribeControlKeyState)(char buf[64], uint32_t x) {
-  return DescribeFlags(buf, 64, kControlKeyState, ARRAYLEN(kControlKeyState),
-                       "kNt", x);
+const char *_DescribeControlKeyState(char buf[64], uint32_t x) {
+  return _DescribeFlags(buf, 64, kControlKeyState, ARRAYLEN(kControlKeyState),
+                        "kNt", x);
 }

libc/intrin/describedirfd.c

@@ -20,7 +20,7 @@
 #include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/at.h"
 
-const char *(DescribeDirfd)(char buf[12], int dirfd) {
+const char *_DescribeDirfd(char buf[12], int dirfd) {
   if (dirfd == AT_FDCWD)
     return "AT_FDCWD";
   FormatInt32(buf, dirfd);

libc/intrin/describednotify.c

@@ -31,7 +31,7 @@ static const struct DescribeFlags kDnotifyFlags[] = {
     {DN_MULTISHOT, "MULTISHOT"},  //
 };
 
-const char *(DescribeDnotifyFlags)(char buf[80], int x) {
-  return DescribeFlags(buf, 80, kDnotifyFlags, ARRAYLEN(kDnotifyFlags), "DN_",
-                       x);
+const char *_DescribeDnotifyFlags(char buf[80], int x) {
+  return _DescribeFlags(buf, 80, kDnotifyFlags, ARRAYLEN(kDnotifyFlags), "DN_",
+                        x);
 }

libc/intrin/describeerrnoresult.c

@@ -22,7 +22,7 @@
 #include "libc/log/libfatal.internal.h"
 #include "libc/str/str.h"
 
-const char *(DescribeErrno)(char buf[30], int ax) {
+const char *_DescribeErrno(char buf[30], int ax) {
   char *p = buf;
   const char *s;
   if (ax < 0) {

libc/intrin/describefcntlcmd.c

@@ -21,7 +21,7 @@
 #include "libc/intrin/describeflags.h"
 #include "libc/str/str.h"
 
-const char *(DescribeFcntlCmd)(char buf[20], int x) {
+const char *_DescribeFcntlCmd(char buf[20], int x) {
   const char *s;
   if (x >= 0 && (s = GetMagnumStr(kFcntlCmds, x))) {
     buf[0] = 'F';

libc/intrin/describefdset.c

@@ -26,7 +26,7 @@
 
 #define append(...) o += ksnprintf(buf + o, N - o, __VA_ARGS__)
 
-const char *(DescribeFdSet)(char buf[N], ssize_t rc, int nfds, fd_set *fds) {
+const char *_DescribeFdSet(char buf[N], ssize_t rc, int nfds, fd_set *fds) {
   int o = 0;
 
   if (!fds)