Fix and unify [err/warn]{xc} function, improves decompilation ##types

libr/anal/d/types-arm-ios-32.sdb.txt

@@ -8,27 +8,6 @@ func.__assert_rtn.noreturn=true
 func.__assert_rtn.ret=void
 func.__assert_rtn.cc=amd64
 
-err=func
-func.err.args=1
-func.err.arg.0=int,eval
-func.err.arg.1=const char *,fmt
-func.err.noreturn=true
-func.err.ret=void
-
-errc=func
-func.errc.args=1
-func.errc.arg.0=int,eval
-func.errc.arg.1=int,code
-func.errc.arg.2=const char *,fmt
-func.errc.noreturn=true
-func.errc.ret=void
-
-errx=func
-func.errx.args=1
-func.errx.arg.0=int,eval
-func.errx.arg.1=const char *,fmt
-func.errx.noreturn=true
-func.errx.ret=void
 _exit=func
 func._exit.args=1
 func._exit.arg.0=int,status

libr/anal/d/types-arm-ios-64.sdb.txt

@@ -15,27 +15,6 @@ func._exit.noreturn=true
 func._exit.ret=void
 func._exit.cc=amd64
 
-err=func
-func.err.args=1
-func.err.arg.0=int,eval
-func.err.arg.1=const char *,fmt
-func.err.noreturn=true
-func.err.ret=void
-
-errc=func
-func.errc.args=1
-func.errc.arg.0=int,eval
-func.errc.arg.1=int,code
-func.errc.arg.2=const char *,fmt
-func.errc.noreturn=true
-func.errc.ret=void
-
-errx=func
-func.errx.args=1
-func.errx.arg.0=int,eval
-func.errx.arg.1=const char *,fmt
-func.errx.noreturn=true
-func.errx.ret=void
 abort=func
 func.abort.args=0
 func.abort.noreturn=true

libr/anal/d/types-darwin.sdb.txt

@@ -24,28 +24,6 @@ func.tputs.arg.1=int,affcnt
 func.tputs.arg.2=void *,putc
 func.tputs.ret=int
 
-err=func
-func.err.args=1
-func.err.arg.0=int,eval
-func.err.arg.1=const char *,fmt
-func.err.noreturn=true
-func.err.ret=void
-
-errc=func
-func.errc.args=1
-func.errc.arg.0=int,eval
-func.errc.arg.1=int,code
-func.errc.arg.2=const char *,fmt
-func.errc.noreturn=true
-func.errc.ret=void
-
-errx=func
-func.errx.args=1
-func.errx.arg.0=int,eval
-func.errx.arg.1=const char *,fmt
-func.errx.noreturn=true
-func.errx.ret=void
-
 _exit=func
 func._exit.args=1
 func._exit.arg.0=int,status

libr/anal/d/types-linux.sdb.txt

@@ -7,33 +7,11 @@ func.__assert_fail.arg.3=const char *,function
 func.__assert_fail.noreturn=true
 func.__assert_fail.ret=void
 
-err=func
-func.err.args=1
-func.err.arg.0=int,eval
-func.err.arg.1=const char *,fmt
-func.err.noreturn=true
-func.err.ret=void
-
 xalloc_die=func
 func.xalloc_die.args=0
 func.xalloc_die.noreturn=true
 func.xalloc_die.ret=void
 
-errc=func
-func.errc.args=1
-func.errc.arg.0=int,eval
-func.errc.arg.1=int,code
-func.errc.arg.2=const char *,fmt
-func.errc.noreturn=true
-func.errc.ret=void
-
-errx=func
-func.errx.args=1
-func.errx.arg.0=int,eval
-func.errx.arg.1=const char *,fmt
-func.errx.noreturn=true
-func.errx.ret=void
-
 _exit=func
 func._exit.args=1
 func._exit.arg.0=int,status

libr/anal/d/types-x86-macos-64.sdb.txt

@@ -33,11 +33,3 @@ func.__stack_chk_fail.args=0
 func.__stack_chk_fail.noreturn=true
 func.__stack_chk_fail.ret=void
 func.__stack_chk_fail.cc=amd64
-
-sym.imp.err=func
-func.sym.imp.err.args=2
-func.sym.imp.err.arg.0=int,eval
-func.sym.imp.err.arg.1=const char *,msg
-func.sym.imp.err.noreturn=true
-func.sym.imp.err.ret=void
-func.sym.imp.err.cc=amd64

libr/anal/d/types.sdb.txt

@@ -2590,22 +2590,6 @@ func.printf.args=1
 func.printf.arg.0=const char *,format
 func.printf.ret=int
 
-warn=func
-func.warn.args=1
-func.warn.arg.0=const char *,format
-func.warn.ret=void
-
-warnx=func
-func.warnx.args=1
-func.warnx.arg.0=const char *,format
-func.warnx.ret=void
-
-warnc=func
-func.warnc.args=2
-func.warnc.arg.1=int,opt
-func.warnc.arg.0=const char *,format
-func.warnc.ret=void
-
 lstat=func
 func.lstat.args=2
 func.lstat.arg.0=const char *,path
@@ -3075,3 +3059,44 @@ func.swift_beginAccess.arg.1=void *
 func.swift_beginAccess.arg.2=void *
 func.swift_beginAccess.arg.3=void *
 func.swift_beginAccess.ret=void
+
+err=func
+func.err.noreturn=true
+func.err.args=2
+func.err.arg.0=int,eval
+func.err.arg.1=const char *,fmt
+func.err.ret=void
+
+errx=func
+func.errx.noreturn=true
+func.errx.args=2
+func.errx.arg.0=int,eval
+func.errx.arg.1=const char *,fmt
+func.errx.ret=void
+
+errc=func
+func.errc.noreturn=true
+func.errc.args=3
+func.errc.arg.0=int,eval
+func.errc.arg.1=int,code
+func.errc.arg.2=const char *,fmt
+func.errc.ret=void
+
+warn=func
+func.warn.args=2
+func.warn.arg.0=int,eval
+func.warn.arg.1=const char *,fmt
+func.warn.ret=void
+
+warnx=func
+func.warnx.args=2
+func.warnx.arg.0=int,eval
+func.warnx.arg.1=const char *,fmt
+func.warnx.ret=void
+
+warnc=func
+func.warnc.args=3
+func.warnc.arg.0=int,eval
+func.warnc.arg.1=int,code
+func.warnc.arg.2=const char *,fmt
+func.warnc.ret=void

test/db/cmd/cmd_k

@@ -1025,13 +1025,13 @@ EXPECT=<<EOF
       "func.erfl.ret=long double",
       "func.err.arg.0=int,eval",
       "func.err.arg.1=const char *,fmt",
-      "func.err.args=1",
+      "func.err.args=2",
       "func.err.noreturn=true",
       "func.err.ret=void",
       "func.errc.arg.0=int,eval",
       "func.errc.arg.1=int,code",
       "func.errc.arg.2=const char *,fmt",
-      "func.errc.args=1",
+      "func.errc.args=3",
       "func.errc.noreturn=true",
       "func.errc.ret=void",
       "func.error.arg.0=int,status",
@@ -1041,7 +1041,7 @@ EXPECT=<<EOF
       "func.error.ret=void",
       "func.errx.arg.0=int,eval",
       "func.errx.arg.1=const char *,fmt",
-      "func.errx.args=1",
+      "func.errx.args=2",
       "func.errx.noreturn=true",
       "func.errx.ret=void",
       "func.exit.arg.0=int,status",
@@ -2568,15 +2568,18 @@ EXPECT=<<EOF
       "func.waitpid.arg.2=int,options",
       "func.waitpid.args=3",
       "func.waitpid.ret=pid_t",
-      "func.warn.arg.0=const char *,format",
-      "func.warn.args=1",
+      "func.warn.arg.0=int,eval",
+      "func.warn.arg.1=const char *,fmt",
+      "func.warn.args=2",
       "func.warn.ret=void",
-      "func.warnc.arg.0=const char *,format",
-      "func.warnc.arg.1=int,opt",
-      "func.warnc.args=2",
+      "func.warnc.arg.0=int,eval",
+      "func.warnc.arg.1=int,code",
+      "func.warnc.arg.2=const char *,fmt",
+      "func.warnc.args=3",
       "func.warnc.ret=void",
-      "func.warnx.arg.0=const char *,format",
-      "func.warnx.args=1",
+      "func.warnx.arg.0=int,eval",
+      "func.warnx.arg.1=const char *,fmt",
+      "func.warnx.args=2",
       "func.warnx.ret=void",
       "func.wcrtomb.arg.0=char *,s",
       "func.wcrtomb.arg.1=wchar_t,wc",

test/db/cmd/types

@@ -1605,19 +1605,25 @@ tn-*
 tn
 EOF
 EXPECT=<<EOF
+err
+errc
 RtlRaiseException
 FreeLibraryAndExitThread
 ExitProcess
 FatalExit
 RaiseException
+errx
 ExitThread
 8
 0x8
+err
+errc
 RtlRaiseException
 FreeLibraryAndExitThread
 ExitProcess
 FatalExit
 RaiseException
+errx
 ExitThread
 EOF
 RUN