Merge pull request #22825 from keszybz/assorted-cleanups

Assorted cleanups

src/basic/errno-to-name.awk

@@ -3,7 +3,7 @@
 BEGIN{
         print "static const char* const errno_names[] = { "
 }
-!/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ {
+!/(EDEADLOCK|EWOULDBLOCK|ENOTSUP)/ {
         printf "        [%s] = \"%s\",\n", $1, $1
 }
 END{