[dpdk-stable] [PATCH v1 1/3] ethdev: remove extra 'new line' in output

patches for DPDK stable branches
 help / color / mirror / Atom feed

* [dpdk-stable] [PATCH v1 1/3] ethdev: remove extra 'new line' in output
       [not found] ` <CGME20200507182612eucas1p10d955ce6857f01fd85a5268d10edc489@eucas1p1.samsung.com>
@ 2020-05-07 18:26   ` Ivan Dyukov
       [not found]     ` <CGME20200507182615eucas1p10a1ad94553507df541e2c43cf952722b@eucas1p1.samsung.com>
                       ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Ivan Dyukov @ 2020-05-07 18:26 UTC (permalink / raw)
  To: dev, i.dyukov, v.kuramshin, thomas, david.marchand, ferruh.yigit,
	arybchenko
  Cc: stable

This is testpmd part of new line cleanup

Fixes: 002ade70e9 (app/test: measure cycles per packet in Rx/Tx)
Fixes: ce8d561418 (app/testpmd: add port configuration settings)
Cc: stable@dpdk.org

Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
---
 app/test-pmd/testpmd.c   | 2 +-
 app/test/test_pmd_perf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 99bacddbf..d4df23a93 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3005,7 +3005,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. speed %u Mbps- %s\n",
 					portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index d61be58bb..352cd4715 100644
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -151,7 +151,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 					if (link_mbps == 0)
 						link_mbps = link.link_speed;
 				} else
-- 
2.17.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

[parent not found: <CGME20200507182615eucas1p10a1ad94553507df541e2c43cf952722b@eucas1p1.samsung.com>]

* [dpdk-stable] [PATCH v1 2/3] examples: remove extra 'new line' in output
       [not found]     ` <CGME20200507182615eucas1p10a1ad94553507df541e2c43cf952722b@eucas1p1.samsung.com>
@ 2020-05-07 18:26       ` Ivan Dyukov
  0 siblings, 0 replies; 4+ messages in thread
From: Ivan Dyukov @ 2020-05-07 18:26 UTC (permalink / raw)
  To: dev, i.dyukov, v.kuramshin, thomas, david.marchand, ferruh.yigit,
	arybchenko
  Cc: stable

This patch removes extra 'new line' in few app examples

Fixes: d3641ae863 (examples: update link status checks)
Cc: stable@dpdk.org

Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
---
 examples/ip_fragmentation/main.c                         | 2 +-
 examples/ipv4_multicast/main.c                           | 2 +-
 examples/l2fwd/main.c                                    | 2 +-
 examples/l3fwd/main.c                                    | 2 +-
 examples/link_status_interrupt/main.c                    | 2 +-
 examples/multi_process/client_server_mp/mp_server/init.c | 2 +-
 examples/multi_process/symmetric_mp/main.c               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 5eca7ba99..4afb97109 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -617,7 +617,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up .Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 1fb28513b..7e255c35a 100644
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -596,7 +596,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 					portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 88ddfe589..f8d14b843 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -478,7 +478,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index dda430d68..84f171f18 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -838,7 +838,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps -%s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c
index 38422f6ac..25efe2b09 100644
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -500,7 +500,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index ad9f46f0a..c2ec07ac6 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -209,7 +209,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 						"Mbps - %s\n", ports->id[portid],
 						(unsigned)link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
 						(uint8_t)ports->id[portid]);
diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index 522f211c0..9a16e198c 100644
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -389,7 +389,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
-- 
2.17.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

[parent not found: <CGME20200507182616eucas1p2b6d7e7ac68b1b0fe8b1d71dd112fcc9d@eucas1p2.samsung.com>]

* [dpdk-stable] [PATCH v1 3/3] examples: remove extra 'new line' in output
       [not found]     ` <CGME20200507182616eucas1p2b6d7e7ac68b1b0fe8b1d71dd112fcc9d@eucas1p2.samsung.com>
@ 2020-05-07 18:26       ` Ivan Dyukov
  0 siblings, 0 replies; 4+ messages in thread
From: Ivan Dyukov @ 2020-05-07 18:26 UTC (permalink / raw)
  To: dev, i.dyukov, v.kuramshin, thomas, david.marchand, ferruh.yigit,
	arybchenko
  Cc: stable

This patch removes extra 'new line' in few app examples

Fixes: d299106e8e (examples/ipsec-secgw: add IPsec sample application)
Fixes: d48415e1fe (examples/performance-thread: add l3fwd-thread app)
Fixes: 3fc5ca2f63 (kni: initial import)
Fixes: 387259bd6c (examples/l2fwd-crypto: add sample application)
Fixes: 20c78ac9ee (examples/vm_power_mgr: add port initialisation)
Fixes: e64833f227 (examples/l2fwd-keepalive: add sample application)
Fixes: de3cfa2c98 (sched: initial import)
Fixes: d7937e2e3d (power: initial import)
Fixes: 204896f8d6 (examples/l2fwd-jobstats: add new example)
Fixes: 4ff457986f (examples/l2fwd-event: add default poll mode routines)
Fixes: 39aad0e88c (examples/flow_distributor: new example to demonstrate EFD)
Fixes: c8e6ceeceb (examples/ioat: add new sample app for ioat driver)
Fixes: 361b2e9559 (acl: new sample l3fwd-acl)
Fixes: cc8f4d020c (examples/ip_reassembly: initial import)
Cc: stable@dpdk.org

Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
---
 examples/ioat/ioatfwd.c                         | 2 +-
 examples/ip_reassembly/main.c                   | 2 +-
 examples/ipsec-secgw/ipsec-secgw.c              | 2 +-
 examples/kni/main.c                             | 2 +-
 examples/l2fwd-crypto/main.c                    | 2 +-
 examples/l2fwd-event/main.c                     | 2 +-
 examples/l2fwd-jobstats/main.c                  | 2 +-
 examples/l2fwd-keepalive/main.c                 | 2 +-
 examples/l3fwd-acl/main.c                       | 2 +-
 examples/l3fwd-power/main.c                     | 2 +-
 examples/performance-thread/l3fwd-thread/main.c | 2 +-
 examples/qos_sched/init.c                       | 2 +-
 examples/server_node_efd/server/init.c          | 2 +-
 examples/vm_power_manager/main.c                | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
index 7255ff3c9..53de23179 100644
--- a/examples/ioat/ioatfwd.c
+++ b/examples/ioat/ioatfwd.c
@@ -718,7 +718,7 @@ check_link_status(uint32_t port_mask)
 				"Port %d Link Up. Speed %u Mbps - %s\n",
 				portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-				("full-duplex") : ("half-duplex\n"));
+				("full-duplex") : ("half-duplex"));
 			link_status = 1;
 		} else
 			printf("Port %d Link Down\n", portid);
diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index e34d8f0e1..494d7ee77 100644
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -736,7 +736,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index 6d02341de..5b3690ce9 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1800,7 +1800,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up - speed %u Mbps -%s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/kni/main.c b/examples/kni/main.c
index 29fc37e1f..6b4ab3b5b 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -683,7 +683,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up - speed %uMbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 61d78295d..fcb55c370 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -1756,7 +1756,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c
index 9cc29d732..9593ef11e 100644
--- a/examples/l2fwd-event/main.c
+++ b/examples/l2fwd-event/main.c
@@ -394,7 +394,7 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc,
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						port_id, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", port_id);
 				continue;
diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index c1ca100ed..396fd89db 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -710,7 +710,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 2ae5a3c6a..3a6bf2e47 100644
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -475,7 +475,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index cccf81929..f22fca732 100644
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -1839,7 +1839,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 293b3da4a..c8339ee5a 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1959,7 +1959,7 @@ check_all_ports_link_status(uint32_t port_mask)
 						"Mbps - %s\n", (uint8_t)portid,
 						(unsigned)link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
 						(uint8_t)portid);
diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index 43a5b9248..84c1d7b3a 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -3457,7 +3457,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index 0a17e0d4d..9626c15b8 100644
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -164,7 +164,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
 		printf(" Link Up - speed %u Mbps - %s\n",
 			(uint32_t) link.link_speed,
 			(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-			("full-duplex") : ("half-duplex\n"));
+			("full-duplex") : ("half-duplex"));
 	} else {
 		printf(" Link Down\n");
 	}
diff --git a/examples/server_node_efd/server/init.c b/examples/server_node_efd/server/init.c
index 00e2e4059..378a74fa5 100644
--- a/examples/server_node_efd/server/init.c
+++ b/examples/server_node_efd/server/init.c
@@ -272,7 +272,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 						info->id[portid],
 						link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
 						info->id[portid]);
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index dc6afb132..273bfec29 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -272,7 +272,7 @@ check_all_ports_link_status(uint32_t port_mask)
 						"Mbps - %s\n", (uint16_t)portid,
 						(unsigned int)link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
 						(uint16_t)portid);
-- 
2.17.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v1 1/3] ethdev: remove extra 'new line' in output
  2020-05-07 18:26   ` [dpdk-stable] [PATCH v1 1/3] ethdev: remove extra 'new line' in output Ivan Dyukov
       [not found]     ` <CGME20200507182615eucas1p10a1ad94553507df541e2c43cf952722b@eucas1p1.samsung.com>
       [not found]     ` <CGME20200507182616eucas1p2b6d7e7ac68b1b0fe8b1d71dd112fcc9d@eucas1p2.samsung.com>
@ 2020-05-12  2:08     ` Thomas Monjalon
  2 siblings, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2020-05-12  2:08 UTC (permalink / raw)
  To: Ivan Dyukov
  Cc: dev, v.kuramshin, david.marchand, ferruh.yigit, arybchenko, stable

07/05/2020 20:26, Ivan Dyukov:
> This is testpmd part of new line cleanup
> 
> Fixes: 002ade70e9 (app/test: measure cycles per packet in Rx/Tx)
> Fixes: ce8d561418 (app/testpmd: add port configuration settings)
> Cc: stable@dpdk.org
> 
> Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
> Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>

Series applied, thanks




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-05-12  2:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <5595669.UjTJXf6HLC@thomas>
     [not found] ` <CGME20200507182612eucas1p10d955ce6857f01fd85a5268d10edc489@eucas1p1.samsung.com>
2020-05-07 18:26   ` [dpdk-stable] [PATCH v1 1/3] ethdev: remove extra 'new line' in output Ivan Dyukov
     [not found]     ` <CGME20200507182615eucas1p10a1ad94553507df541e2c43cf952722b@eucas1p1.samsung.com>
2020-05-07 18:26       ` [dpdk-stable] [PATCH v1 2/3] examples: " Ivan Dyukov
     [not found]     ` <CGME20200507182616eucas1p2b6d7e7ac68b1b0fe8b1d71dd112fcc9d@eucas1p2.samsung.com>
2020-05-07 18:26       ` [dpdk-stable] [PATCH v1 3/3] " Ivan Dyukov
2020-05-12  2:08     ` [dpdk-stable] [dpdk-dev] [PATCH v1 1/3] ethdev: " Thomas Monjalon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).