* [PATCH 06/17] netconfig: Avoid returning internal l_queues
@ 2022-05-13 22:47 Andrew Zaborowski
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Zaborowski @ 2022-05-13 22:47 UTC (permalink / raw)
To: ell
[-- Attachment #1: Type: text/plain, Size: 3808 bytes --]
Return const struct l_queue_entry pointers instead.
---
ell/netconfig.c | 35 ++++++++++++++++++-----------------
ell/netconfig.h | 20 +++++++++++---------
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/ell/netconfig.c b/ell/netconfig.c
index 990b166..94d3ed1 100644
--- a/ell/netconfig.c
+++ b/ell/netconfig.c
@@ -1231,37 +1231,38 @@ LIB_EXPORT void l_netconfig_apply_rtnl(struct l_netconfig *netconfig,
NULL, NULL, NULL);
}
-LIB_EXPORT struct l_queue *l_netconfig_get_addresses(
- struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed)
+LIB_EXPORT const struct l_queue_entry *l_netconfig_get_addresses(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed)
{
if (out_added)
- *out_added = netconfig->addresses.added;
+ *out_added = l_queue_get_entries(netconfig->addresses.added);
if (out_updated)
- *out_updated = netconfig->addresses.updated;
+ *out_updated = l_queue_get_entries(netconfig->addresses.updated);
if (out_removed)
- *out_removed = netconfig->addresses.removed;
+ *out_removed = l_queue_get_entries(netconfig->addresses.removed);
- return netconfig->addresses.current;
+ return l_queue_get_entries(netconfig->addresses.current);
}
-LIB_EXPORT struct l_queue *l_netconfig_get_routes(struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed)
+LIB_EXPORT const struct l_queue_entry *l_netconfig_get_routes(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed)
{
if (out_added)
- *out_added = netconfig->routes.added;
+ *out_added = l_queue_get_entries(netconfig->routes.added);
if (out_updated)
- *out_updated = netconfig->routes.updated;
+ *out_updated = l_queue_get_entries(netconfig->routes.updated);
if (out_removed)
- *out_removed = netconfig->routes.removed;
+ *out_removed = l_queue_get_entries(netconfig->routes.removed);
- return netconfig->routes.current;
+ return l_queue_get_entries(netconfig->routes.current);
}
diff --git a/ell/netconfig.h b/ell/netconfig.h
index f90ec81..d58dda1 100644
--- a/ell/netconfig.h
+++ b/ell/netconfig.h
@@ -33,7 +33,7 @@ struct l_dhcp_client;
struct l_dhcp6_client;
struct l_icmp6_client;
struct l_netlink;
-struct l_queue;
+struct l_queue_entry;
struct l_netconfig;
struct l_rtnl_address;
struct l_rtnl_route;
@@ -83,14 +83,16 @@ void l_netconfig_set_event_handler(struct l_netconfig *netconfig,
void l_netconfig_apply_rtnl(struct l_netconfig *netconfig,
struct l_netlink *rtnl);
-struct l_queue *l_netconfig_get_addresses(struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed);
-struct l_queue *l_netconfig_get_routes(struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed);
+const struct l_queue_entry *l_netconfig_get_addresses(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed);
+const struct l_queue_entry *l_netconfig_get_routes(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed);
#ifdef __cplusplus
}
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 06/17] netconfig: Avoid returning internal l_queues
@ 2022-05-18 18:54 Denis Kenzior
0 siblings, 0 replies; 3+ messages in thread
From: Denis Kenzior @ 2022-05-18 18:54 UTC (permalink / raw)
To: ell
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
Hi Andrew,
On 5/13/22 17:47, Andrew Zaborowski wrote:
> Return const struct l_queue_entry pointers instead.
> ---
> ell/netconfig.c | 35 ++++++++++++++++++-----------------
> ell/netconfig.h | 20 +++++++++++---------
> 2 files changed, 29 insertions(+), 26 deletions(-)
>
No objections to this, but I wish examples/ changes were right after this patch :)
Regards,
-Denis
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 06/17] netconfig: Avoid returning internal l_queues
@ 2022-05-13 14:54 Andrew Zaborowski
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Zaborowski @ 2022-05-13 14:54 UTC (permalink / raw)
To: ell
[-- Attachment #1: Type: text/plain, Size: 3808 bytes --]
Return const struct l_queue_entry pointers instead.
---
ell/netconfig.c | 35 ++++++++++++++++++-----------------
ell/netconfig.h | 20 +++++++++++---------
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/ell/netconfig.c b/ell/netconfig.c
index 9c58781..aee56a2 100644
--- a/ell/netconfig.c
+++ b/ell/netconfig.c
@@ -1226,37 +1226,38 @@ LIB_EXPORT void l_netconfig_apply_rtnl(struct l_netconfig *netconfig,
NULL, NULL, NULL);
}
-LIB_EXPORT struct l_queue *l_netconfig_get_addresses(
- struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed)
+LIB_EXPORT const struct l_queue_entry *l_netconfig_get_addresses(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed)
{
if (out_added)
- *out_added = netconfig->addresses.added;
+ *out_added = l_queue_get_entries(netconfig->addresses.added);
if (out_updated)
- *out_updated = netconfig->addresses.updated;
+ *out_updated = l_queue_get_entries(netconfig->addresses.updated);
if (out_removed)
- *out_removed = netconfig->addresses.removed;
+ *out_removed = l_queue_get_entries(netconfig->addresses.removed);
- return netconfig->addresses.current;
+ return l_queue_get_entries(netconfig->addresses.current);
}
-LIB_EXPORT struct l_queue *l_netconfig_get_routes(struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed)
+LIB_EXPORT const struct l_queue_entry *l_netconfig_get_routes(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed)
{
if (out_added)
- *out_added = netconfig->routes.added;
+ *out_added = l_queue_get_entries(netconfig->routes.added);
if (out_updated)
- *out_updated = netconfig->routes.updated;
+ *out_updated = l_queue_get_entries(netconfig->routes.updated);
if (out_removed)
- *out_removed = netconfig->routes.removed;
+ *out_removed = l_queue_get_entries(netconfig->routes.removed);
- return netconfig->routes.current;
+ return l_queue_get_entries(netconfig->routes.current);
}
diff --git a/ell/netconfig.h b/ell/netconfig.h
index f90ec81..d58dda1 100644
--- a/ell/netconfig.h
+++ b/ell/netconfig.h
@@ -33,7 +33,7 @@ struct l_dhcp_client;
struct l_dhcp6_client;
struct l_icmp6_client;
struct l_netlink;
-struct l_queue;
+struct l_queue_entry;
struct l_netconfig;
struct l_rtnl_address;
struct l_rtnl_route;
@@ -83,14 +83,16 @@ void l_netconfig_set_event_handler(struct l_netconfig *netconfig,
void l_netconfig_apply_rtnl(struct l_netconfig *netconfig,
struct l_netlink *rtnl);
-struct l_queue *l_netconfig_get_addresses(struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed);
-struct l_queue *l_netconfig_get_routes(struct l_netconfig *netconfig,
- struct l_queue **out_added,
- struct l_queue **out_updated,
- struct l_queue **out_removed);
+const struct l_queue_entry *l_netconfig_get_addresses(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed);
+const struct l_queue_entry *l_netconfig_get_routes(
+ struct l_netconfig *netconfig,
+ const struct l_queue_entry **out_added,
+ const struct l_queue_entry **out_updated,
+ const struct l_queue_entry **out_removed);
#ifdef __cplusplus
}
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-18 18:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 22:47 [PATCH 06/17] netconfig: Avoid returning internal l_queues Andrew Zaborowski
-- strict thread matches above, loose matches on Subject: below --
2022-05-18 18:54 Denis Kenzior
2022-05-13 14:54 Andrew Zaborowski
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).