xlat: rename *sock*options xlat tables

Such names as sockrxrpcoptions are incomprehensible.

* xlat/getsockipoptions.in: Rename to xlat/getsock_ip_options.in.
* xlat/getsockipv6options.in: Rename to xlat/getsock_ipv6_options.in.
* xlat/setsockipoptions.in: Rename to xlat/setsock_ip_options.in.
* xlat/setsockipv6options.in: Rename to xlat/setsock_ipv6_options.in.
* xlat/sockalgoptions.in: Rename to xlat/sock_alg_options.in.
* xlat/sockbluetoothoptions.in: Rename to xlat/sock_bluetooth_options.in.
* xlat/sockcaifoptions.in: Rename to xlat/sock_caif_options.in.
* xlat/sockdccpoptions.in: Rename to xlat/sock_dccp_options.in.
* xlat/sockipoptions.in: Rename to xlat/sock_ip_options.in.
* xlat/sockipv6options.in: Rename to xlat/sock_ipv6_options.in.
* xlat/sockipxoptions.in: Rename to xlat/sock_ipx_options.in.
* xlat/sockirdaoptions.in: Rename to xlat/sock_irda_options.in.
* xlat/sockiucvoptions.in: Rename to xlat/sock_iucv_options.in.
* xlat/sockkcmoptions.in: Rename to xlat/sock_kcm_options.in.
* xlat/sockllcoptions.in: Rename to xlat/sock_llc_options.in.
* xlat/socknetlinkoptions.in: Rename to xlat/sock_netlink_options.in.
* xlat/socknfcllcpoptions.in: Rename to xlat/sock_nfcllcp_options.in.
* xlat/sockoptions.in: Rename to xlat/sock_options.in.
* xlat/sockpacketoptions.in: Rename to xlat/sock_packet_options.in.
* xlat/sockpnpoptions.in: Rename to xlat/sock_pnp_options.in.
* xlat/sockpppol2tpoptions.in: Rename to xlat/sock_pppol2tp_options.in.
* xlat/sockrawoptions.in: Rename to xlat/sock_raw_options.in.
* xlat/sockrdsoptions.in: Rename to xlat/sock_rds_options.in.
* xlat/sockrxrpcoptions.in: Rename to xlat/sock_rxrpc_options.in.
* xlat/socksctpoptions.in: Rename to xlat/sock_sctp_options.in.
* xlat/socktcpoptions.in: Rename to xlat/sock_tcp_options.in.
* xlat/socktipcoptions.in: Rename to xlat/sock_tipc_options.in.
* xlat/socktlsoptions.in: Rename to xlat/sock_tls_options.in.
* xlat/sockudpoptions.in: Rename to xlat/sock_udp_options.in.
* net.c: Update.

diff --git a/net.c b/net.c
index a1f368de15d1018c9ed1740350479c59f9083227..72b2b0ca00351fd35989dd6b2b6bf039481d5494 100644 (file)
--- a/net.c
+++ b/net.c
@@ -425,35 +425,35 @@ SYS_FUNC(socketpair)
        return 0;
 }
 
-#include "xlat/sockoptions.h"
-#include "xlat/sockipoptions.h"
-#include "xlat/getsockipoptions.h"
-#include "xlat/setsockipoptions.h"
-#include "xlat/sockipv6options.h"
-#include "xlat/getsockipv6options.h"
-#include "xlat/setsockipv6options.h"
-#include "xlat/sockipxoptions.h"
-#include "xlat/socknetlinkoptions.h"
-#include "xlat/sockpacketoptions.h"
-#include "xlat/sockrawoptions.h"
-#include "xlat/socksctpoptions.h"
-#include "xlat/socktcpoptions.h"
-#include "xlat/sockudpoptions.h"
-#include "xlat/sockirdaoptions.h"
-#include "xlat/sockllcoptions.h"
-#include "xlat/sockdccpoptions.h"
-#include "xlat/socktipcoptions.h"
-#include "xlat/sockrxrpcoptions.h"
-#include "xlat/sockpppol2tpoptions.h"
-#include "xlat/sockbluetoothoptions.h"
-#include "xlat/sockpnpoptions.h"
-#include "xlat/sockrdsoptions.h"
-#include "xlat/sockiucvoptions.h"
-#include "xlat/sockcaifoptions.h"
-#include "xlat/sockalgoptions.h"
-#include "xlat/socknfcllcpoptions.h"
-#include "xlat/sockkcmoptions.h"
-#include "xlat/socktlsoptions.h"
+#include "xlat/sock_options.h"
+#include "xlat/sock_ip_options.h"
+#include "xlat/getsock_ip_options.h"
+#include "xlat/setsock_ip_options.h"
+#include "xlat/sock_ipv6_options.h"
+#include "xlat/getsock_ipv6_options.h"
+#include "xlat/setsock_ipv6_options.h"
+#include "xlat/sock_ipx_options.h"
+#include "xlat/sock_netlink_options.h"
+#include "xlat/sock_packet_options.h"
+#include "xlat/sock_raw_options.h"
+#include "xlat/sock_sctp_options.h"
+#include "xlat/sock_tcp_options.h"
+#include "xlat/sock_udp_options.h"
+#include "xlat/sock_irda_options.h"
+#include "xlat/sock_llc_options.h"
+#include "xlat/sock_dccp_options.h"
+#include "xlat/sock_tipc_options.h"
+#include "xlat/sock_rxrpc_options.h"
+#include "xlat/sock_pppol2tp_options.h"
+#include "xlat/sock_bluetooth_options.h"
+#include "xlat/sock_pnp_options.h"
+#include "xlat/sock_rds_options.h"
+#include "xlat/sock_iucv_options.h"
+#include "xlat/sock_caif_options.h"
+#include "xlat/sock_alg_options.h"
+#include "xlat/sock_nfcllcp_options.h"
+#include "xlat/sock_kcm_options.h"
+#include "xlat/sock_tls_options.h"
 
 static void
 print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
@@ -466,81 +466,83 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
 
        switch (level) {
        case SOL_SOCKET:
-               printxval(sockoptions, name, "SO_???");
+               printxval(sock_options, name, "SO_???");
                break;
        case SOL_IP:
-               printxvals(name, "IP_???", sockipoptions,
-                       is_getsockopt ? getsockipoptions : setsockipoptions, NULL);
+               printxvals(name, "IP_???", sock_ip_options,
+                          is_getsockopt ? getsock_ip_options :
+                                          setsock_ip_options, NULL);
                break;
        case SOL_IPV6:
-               printxvals(name, "IPV6_???", sockipv6options,
-                       is_getsockopt ? getsockipv6options : setsockipv6options, NULL);
+               printxvals(name, "IPV6_???", sock_ipv6_options,
+                          is_getsockopt ? getsock_ipv6_options :
+                                          setsock_ipv6_options, NULL);
                break;
        case SOL_IPX:
-               printxval(sockipxoptions, name, "IPX_???");
+               printxval(sock_ipx_options, name, "IPX_???");
                break;
        case SOL_PACKET:
-               printxval(sockpacketoptions, name, "PACKET_???");
+               printxval(sock_packet_options, name, "PACKET_???");
                break;
        case SOL_TCP:
-               printxval(socktcpoptions, name, "TCP_???");
+               printxval(sock_tcp_options, name, "TCP_???");
                break;
        case SOL_SCTP:
-               printxval(socksctpoptions, name, "SCTP_???");
+               printxval(sock_sctp_options, name, "SCTP_???");
                break;
        case SOL_RAW:
-               printxval(sockrawoptions, name, "RAW_???");
+               printxval(sock_raw_options, name, "RAW_???");
                break;
        case SOL_NETLINK:
-               printxval(socknetlinkoptions, name, "NETLINK_???");
+               printxval(sock_netlink_options, name, "NETLINK_???");
                break;
        case SOL_UDP:
-               printxval(sockudpoptions, name, "UDP_???");
+               printxval(sock_udp_options, name, "UDP_???");
                break;
        case SOL_IRDA:
-               printxval_index(sockirdaoptions, name, "IRLMP_???");
+               printxval_index(sock_irda_options, name, "IRLMP_???");
                break;
        case SOL_LLC:
-               printxval_index(sockllcoptions, name, "LLC_OPT_???");
+               printxval_index(sock_llc_options, name, "LLC_OPT_???");
                break;
        case SOL_DCCP:
-               printxval_search(sockdccpoptions, name, "DCCP_SOCKOPT_???");
+               printxval_search(sock_dccp_options, name, "DCCP_SOCKOPT_???");
                break;
        case SOL_TIPC:
-               printxval_search(socktipcoptions, name, "TIPC_???");
+               printxval_search(sock_tipc_options, name, "TIPC_???");
                break;
        case SOL_RXRPC:
-               printxval_index(sockrxrpcoptions, name, "RXRPC_???");
+               printxval_index(sock_rxrpc_options, name, "RXRPC_???");
                break;
        case SOL_PPPOL2TP:
-               printxval_index(sockpppol2tpoptions, name, "PPPOL2TP_SO_???");
+               printxval_index(sock_pppol2tp_options, name, "PPPOL2TP_SO_???");
                break;
        case SOL_BLUETOOTH:
-               printxval_search(sockbluetoothoptions, name, "BT_???");
+               printxval_search(sock_bluetooth_options, name, "BT_???");
                break;
        case SOL_PNPIPE:
-               printxval(sockpnpoptions, name, "PNPIPE_???");
+               printxval(sock_pnp_options, name, "PNPIPE_???");
                break;
        case SOL_RDS:
-               printxval(sockrdsoptions, name, "RDS_???");
+               printxval(sock_rds_options, name, "RDS_???");
                break;
        case SOL_IUCV:
-               printxval(sockiucvoptions, name, "SO_???");
+               printxval(sock_iucv_options, name, "SO_???");
                break;
        case SOL_CAIF:
-               printxval(sockcaifoptions, name, "CAIFSO_???");
+               printxval(sock_caif_options, name, "CAIFSO_???");
                break;
        case SOL_ALG:
-               printxval_index(sockalgoptions, name, "ALG_???");
+               printxval_index(sock_alg_options, name, "ALG_???");
                break;
        case SOL_NFC:
-               printxval_index(socknfcllcpoptions, name, "NFC_LLCP_???");
+               printxval_index(sock_nfcllcp_options, name, "NFC_LLCP_???");
                break;
        case SOL_KCM:
-               printxval(sockkcmoptions, name, "KCM_???");
+               printxval(sock_kcm_options, name, "KCM_???");
                break;
        case SOL_TLS:
-               printxval(socktlsoptions, name, "TLS_???");
+               printxval(sock_tls_options, name, "TLS_???");
                break;
 
                /* Other SOL_* protocol levels still need work. */

diff --git a/xlat/getsockipoptions.in b/xlat/getsock_ip_options.in
similarity index 92%
rename from xlat/getsockipoptions.in
rename to xlat/getsock_ip_options.in
index 847cec2a58b12f2106457d791aa1f3539582b02b..7b054608c03512e7c4d1040af0b4333ff41b0f49 100644 (file)
--- a/xlat/getsockipoptions.in
+++ b/xlat/getsock_ip_options.in
@@ -1,7 +1,7 @@
 /*
  * Options specific to getsockopt(SOL_IP).
  * Common {g,s}etsockopt(SOL_IP) options
- * should be in sockipoptions.in instead.
+ * should be in sock_ip_options.in instead.
  */
 
 ARPT_SO_GET_INFO

diff --git a/xlat/getsockipv6options.in b/xlat/getsock_ipv6_options.in
similarity index 80%
rename from xlat/getsockipv6options.in
rename to xlat/getsock_ipv6_options.in
index da44a101aed6fe65f72ccbc6f77345fcb55df9a6..98c450fa7f0ed8492bbd5aba287a841d4b344a0f 100644 (file)
--- a/xlat/getsockipv6options.in
+++ b/xlat/getsock_ipv6_options.in
@@ -1,7 +1,7 @@
 /*
  * Options specific to getsockopt(SOL_IPV6).
  * Common {g,s}etsockopt(SOL_IPV6) options
- * should be in sockipv6options.in instead.
+ * should be in sock_ipv6_options.in instead.
  */
 
 IP6T_SO_GET_INFO

diff --git a/xlat/setsockipoptions.in b/xlat/setsock_ip_options.in
similarity index 92%
rename from xlat/setsockipoptions.in
rename to xlat/setsock_ip_options.in
index 878a5945c5b3a25f885385979830294fea592ee0..c811439f0aaf640b65159d97d5908f84734c7126 100644 (file)
--- a/xlat/setsockipoptions.in
+++ b/xlat/setsock_ip_options.in
@@ -1,7 +1,7 @@
 /*
  * Options specific to setsockopt(SOL_IP).
  * Common {g,s}etsockopt(SOL_IP) options
- * should be in sockipoptions.in instead.
+ * should be in sock_ip_options.in instead.
  */
 
 ARPT_SO_SET_REPLACE

diff --git a/xlat/setsockipv6options.in b/xlat/setsock_ipv6_options.in
similarity index 75%
rename from xlat/setsockipv6options.in
rename to xlat/setsock_ipv6_options.in
index a9eff851ee393861be2b0722f89779264bedff19..087a176b9708ac1b69a735e7d923668d4f71090c 100644 (file)
--- a/xlat/setsockipv6options.in
+++ b/xlat/setsock_ipv6_options.in
@@ -1,7 +1,7 @@
 /*
  * Options specific to setsockopt(SOL_IPV6).
  * Common {g,s}etsockopt(SOL_IPV6) options
- * should be in sockipv6options.in instead.
+ * should be in sock_ipv6_options.in instead.
  */
 
 IP6T_SO_SET_REPLACE

diff --git a/xlat/sockalgoptions.in b/xlat/sock_alg_options.in
similarity index 100%
rename from xlat/sockalgoptions.in
rename to xlat/sock_alg_options.in

diff --git a/xlat/sockbluetoothoptions.in b/xlat/sock_bluetooth_options.in
similarity index 100%
rename from xlat/sockbluetoothoptions.in
rename to xlat/sock_bluetooth_options.in

diff --git a/xlat/sockcaifoptions.in b/xlat/sock_caif_options.in
similarity index 100%
rename from xlat/sockcaifoptions.in
rename to xlat/sock_caif_options.in

diff --git a/xlat/sockdccpoptions.in b/xlat/sock_dccp_options.in
similarity index 100%
rename from xlat/sockdccpoptions.in
rename to xlat/sock_dccp_options.in

diff --git a/xlat/sockipoptions.in b/xlat/sock_ip_options.in
similarity index 100%
rename from xlat/sockipoptions.in
rename to xlat/sock_ip_options.in

diff --git a/xlat/sockipv6options.in b/xlat/sock_ipv6_options.in
similarity index 100%
rename from xlat/sockipv6options.in
rename to xlat/sock_ipv6_options.in

diff --git a/xlat/sockipxoptions.in b/xlat/sock_ipx_options.in
similarity index 100%
rename from xlat/sockipxoptions.in
rename to xlat/sock_ipx_options.in

diff --git a/xlat/sockirdaoptions.in b/xlat/sock_irda_options.in
similarity index 100%
rename from xlat/sockirdaoptions.in
rename to xlat/sock_irda_options.in

diff --git a/xlat/sockiucvoptions.in b/xlat/sock_iucv_options.in
similarity index 100%
rename from xlat/sockiucvoptions.in
rename to xlat/sock_iucv_options.in

diff --git a/xlat/sockkcmoptions.in b/xlat/sock_kcm_options.in
similarity index 100%
rename from xlat/sockkcmoptions.in
rename to xlat/sock_kcm_options.in

diff --git a/xlat/sockllcoptions.in b/xlat/sock_llc_options.in
similarity index 100%
rename from xlat/sockllcoptions.in
rename to xlat/sock_llc_options.in

diff --git a/xlat/socknetlinkoptions.in b/xlat/sock_netlink_options.in
similarity index 100%
rename from xlat/socknetlinkoptions.in
rename to xlat/sock_netlink_options.in

diff --git a/xlat/socknfcllcpoptions.in b/xlat/sock_nfcllcp_options.in
similarity index 100%
rename from xlat/socknfcllcpoptions.in
rename to xlat/sock_nfcllcp_options.in

diff --git a/xlat/sockoptions.in b/xlat/sock_options.in
similarity index 100%
rename from xlat/sockoptions.in
rename to xlat/sock_options.in

diff --git a/xlat/sockpacketoptions.in b/xlat/sock_packet_options.in
similarity index 100%
rename from xlat/sockpacketoptions.in
rename to xlat/sock_packet_options.in

diff --git a/xlat/sockpnpoptions.in b/xlat/sock_pnp_options.in
similarity index 100%
rename from xlat/sockpnpoptions.in
rename to xlat/sock_pnp_options.in

diff --git a/xlat/sockpppol2tpoptions.in b/xlat/sock_pppol2tp_options.in
similarity index 100%
rename from xlat/sockpppol2tpoptions.in
rename to xlat/sock_pppol2tp_options.in

diff --git a/xlat/sockrawoptions.in b/xlat/sock_raw_options.in
similarity index 100%
rename from xlat/sockrawoptions.in
rename to xlat/sock_raw_options.in

diff --git a/xlat/sockrdsoptions.in b/xlat/sock_rds_options.in
similarity index 100%
rename from xlat/sockrdsoptions.in
rename to xlat/sock_rds_options.in

diff --git a/xlat/sockrxrpcoptions.in b/xlat/sock_rxrpc_options.in
similarity index 100%
rename from xlat/sockrxrpcoptions.in
rename to xlat/sock_rxrpc_options.in

diff --git a/xlat/socksctpoptions.in b/xlat/sock_sctp_options.in
similarity index 100%
rename from xlat/socksctpoptions.in
rename to xlat/sock_sctp_options.in

diff --git a/xlat/socktcpoptions.in b/xlat/sock_tcp_options.in
similarity index 100%
rename from xlat/socktcpoptions.in
rename to xlat/sock_tcp_options.in

diff --git a/xlat/socktipcoptions.in b/xlat/sock_tipc_options.in
similarity index 100%
rename from xlat/socktipcoptions.in
rename to xlat/sock_tipc_options.in

diff --git a/xlat/socktlsoptions.in b/xlat/sock_tls_options.in
similarity index 100%
rename from xlat/socktlsoptions.in
rename to xlat/sock_tls_options.in

diff --git a/xlat/sockudpoptions.in b/xlat/sock_udp_options.in
similarity index 100%
rename from xlat/sockudpoptions.in
rename to xlat/sock_udp_options.in