[Bf-blender-cvs] [b50c475cd25] master: Cleanup: move listbase.c to c++
Jacques Lucke
noreply at git.blender.org
Tue Dec 13 18:16:07 CET 2022
Commit: b50c475cd251cbb730ac4af26cb99bc71e529147
Author: Jacques Lucke
Date: Tue Dec 13 18:12:52 2022 +0100
Branches: master
https://developer.blender.org/rBb50c475cd251cbb730ac4af26cb99bc71e529147
Cleanup: move listbase.c to c++
===================================================================
M intern/ghost/test/CMakeLists.txt
M source/blender/blenlib/CMakeLists.txt
R072 source/blender/blenlib/intern/listbase.c source/blender/blenlib/intern/listbase.cc
M source/blender/makesdna/intern/CMakeLists.txt
===================================================================
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index 3f74f97f115..11dd6f75ef9 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -167,7 +167,7 @@ add_library(bli_lib
"../../../source/blender/blenlib/intern/rct.c"
"../../../source/blender/blenlib/intern/string.c"
"../../../source/blender/blenlib/intern/string_utf8.c"
- "../../../source/blender/blenlib/intern/listbase.c"
+ "../../../source/blender/blenlib/intern/listbase.cc"
"../../../source/blender/blenlib/intern/math_color.c"
"../../../source/blender/blenlib/intern/math_geom.c"
"../../../source/blender/blenlib/intern/math_matrix.c"
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 1229344cb05..17218a2daed 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -89,7 +89,7 @@ set(SRC
intern/lasso_2d.c
intern/lazy_threading.cc
intern/length_parameterize.cc
- intern/listbase.c
+ intern/listbase.cc
intern/math_base.c
intern/math_base_inline.c
intern/math_base_safe_inline.c
diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.cc
similarity index 72%
rename from source/blender/blenlib/intern/listbase.c
rename to source/blender/blenlib/intern/listbase.cc
index 3932e5eb051..ee0c6fcd5c3 100644
--- a/source/blender/blenlib/intern/listbase.c
+++ b/source/blender/blenlib/intern/listbase.cc
@@ -22,56 +22,56 @@
void BLI_movelisttolist(ListBase *dst, ListBase *src)
{
- if (src->first == NULL) {
+ if (src->first == nullptr) {
return;
}
- if (dst->first == NULL) {
+ if (dst->first == nullptr) {
dst->first = src->first;
dst->last = src->last;
}
else {
- ((Link *)dst->last)->next = src->first;
- ((Link *)src->first)->prev = dst->last;
+ ((Link *)dst->last)->next = static_cast<Link *>(src->first);
+ ((Link *)src->first)->prev = static_cast<Link *>(dst->last);
dst->last = src->last;
}
- src->first = src->last = NULL;
+ src->first = src->last = nullptr;
}
void BLI_movelisttolist_reverse(ListBase *dst, ListBase *src)
{
- if (src->first == NULL) {
+ if (src->first == nullptr) {
return;
}
- if (dst->first == NULL) {
+ if (dst->first == nullptr) {
dst->first = src->first;
dst->last = src->last;
}
else {
- ((Link *)src->last)->next = dst->first;
- ((Link *)dst->first)->prev = src->last;
+ ((Link *)src->last)->next = static_cast<Link *>(dst->first);
+ ((Link *)dst->first)->prev = static_cast<Link *>(src->last);
dst->first = src->first;
}
- src->first = src->last = NULL;
+ src->first = src->last = nullptr;
}
void BLI_addhead(ListBase *listbase, void *vlink)
{
- Link *link = vlink;
+ Link *link = static_cast<Link *>(vlink);
- if (link == NULL) {
+ if (link == nullptr) {
return;
}
- link->next = listbase->first;
- link->prev = NULL;
+ link->next = static_cast<Link *>(listbase->first);
+ link->prev = nullptr;
if (listbase->first) {
((Link *)listbase->first)->prev = link;
}
- if (listbase->last == NULL) {
+ if (listbase->last == nullptr) {
listbase->last = link;
}
listbase->first = link;
@@ -79,19 +79,19 @@ void BLI_addhead(ListBase *listbase, void *vlink)
void BLI_addtail(ListBase *listbase, void *vlink)
{
- Link *link = vlink;
+ Link *link = static_cast<Link *>(vlink);
- if (link == NULL) {
+ if (link == nullptr) {
return;
}
- link->next = NULL;
- link->prev = listbase->last;
+ link->next = nullptr;
+ link->prev = static_cast<Link *>(listbase->last);
if (listbase->last) {
((Link *)listbase->last)->next = link;
}
- if (listbase->first == NULL) {
+ if (listbase->first == nullptr) {
listbase->first = link;
}
listbase->last = link;
@@ -99,9 +99,9 @@ void BLI_addtail(ListBase *listbase, void *vlink)
void BLI_remlink(ListBase *listbase, void *vlink)
{
- Link *link = vlink;
+ Link *link = static_cast<Link *>(vlink);
- if (link == NULL) {
+ if (link == nullptr) {
return;
}
@@ -132,8 +132,8 @@ bool BLI_remlink_safe(ListBase *listbase, void *vlink)
void BLI_listbase_swaplinks(ListBase *listbase, void *vlinka, void *vlinkb)
{
- Link *linka = vlinka;
- Link *linkb = vlinkb;
+ Link *linka = static_cast<Link *>(vlinka);
+ Link *linkb = static_cast<Link *>(vlinkb);
if (!linka || !linkb) {
return;
@@ -185,15 +185,15 @@ void BLI_listbase_swaplinks(ListBase *listbase, void *vlinka, void *vlinkb)
void BLI_listbases_swaplinks(ListBase *listbasea, ListBase *listbaseb, void *vlinka, void *vlinkb)
{
- Link *linka = vlinka;
- Link *linkb = vlinkb;
- Link linkc = {NULL};
+ Link *linka = static_cast<Link *>(vlinka);
+ Link *linkb = static_cast<Link *>(vlinkb);
+ Link linkc = {nullptr};
if (!linka || !linkb) {
return;
}
- /* The reference to `linkc` assigns NULL, not a dangling pointer so it can be ignored. */
+ /* The reference to `linkc` assigns nullptr, not a dangling pointer so it can be ignored. */
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 1201 /* gcc12.1+ only */
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdangling-pointer"
@@ -221,7 +221,7 @@ void BLI_listbases_swaplinks(ListBase *listbasea, ListBase *listbaseb, void *vli
void *BLI_pophead(ListBase *listbase)
{
Link *link;
- if ((link = listbase->first)) {
+ if ((link = static_cast<Link *>(listbase->first))) {
BLI_remlink(listbase, link);
}
return link;
@@ -230,7 +230,7 @@ void *BLI_pophead(ListBase *listbase)
void *BLI_poptail(ListBase *listbase)
{
Link *link;
- if ((link = listbase->last)) {
+ if ((link = static_cast<Link *>(listbase->last))) {
BLI_remlink(listbase, link);
}
return link;
@@ -238,9 +238,9 @@ void *BLI_poptail(ListBase *listbase)
void BLI_freelinkN(ListBase *listbase, void *vlink)
{
- Link *link = vlink;
+ Link *link = static_cast<Link *>(vlink);
- if (link == NULL) {
+ if (link == nullptr) {
return;
}
@@ -253,7 +253,7 @@ void BLI_freelinkN(ListBase *listbase, void *vlink)
*/
static void listbase_double_from_single(Link *iter, ListBase *listbase)
{
- Link *prev = NULL;
+ Link *prev = nullptr;
listbase->first = iter;
do {
iter->prev = prev;
@@ -281,7 +281,7 @@ static void listbase_double_from_single(Link *iter, ListBase *listbase)
void BLI_listbase_sort(ListBase *listbase, int (*cmp)(const void *, const void *))
{
if (listbase->first != listbase->last) {
- Link *head = listbase->first;
+ Link *head = static_cast<Link *>(listbase->first);
head = listbase_sort_fn(head, cmp);
listbase_double_from_single(head, listbase);
}
@@ -292,7 +292,7 @@ void BLI_listbase_sort_r(ListBase *listbase,
void *thunk)
{
if (listbase->first != listbase->last) {
- Link *head = listbase->first;
+ Link *head = static_cast<Link *>(listbase->first);
head = listbase_sort_fn_r(head, cmp, thunk);
listbase_double_from_single(head, listbase);
}
@@ -300,25 +300,25 @@ void BLI_listbase_sort_r(ListBase *listbase,
void BLI_insertlinkafter(ListBase *listbase, void *vprevlink, void *vnewlink)
{
- Link *prevlink = vprevlink;
- Link *newlink = vnewlink;
+ Link *prevlink = static_cast<Link *>(vprevlink);
+ Link *newlink = static_cast<Link *>(vnewlink);
/* newlink before nextlink */
- if (newlink == NULL) {
+ if (newlink == nullptr) {
return;
}
/* empty list */
- if (listbase->first == NULL) {
+ if (listbase->first == nullptr) {
listbase->first = newlink;
listbase->last = newlink;
return;
}
/* insert at head of list */
- if (prevlink == NULL) {
- newlink->prev = NULL;
- newlink->next = listbase->first;
+ if (prevlink == nullptr) {
+ newlink->prev = nullptr;
+ newlink->next = static_cast<Link *>(listbase->first);
newlink->next->prev = newlink;
listbase->first = newlink;
return;
@@ -339,25 +339,25 @@ void BLI_insertlinkafter(ListBase *listbase, void *vprevlink, void *vnewlink)
void BLI_insertlinkbefore(ListBase *listbase, void *vnextlink, void *vnewlink)
{
- Link *nextlink = vnextlink;
- Link *newlink = vnewlink;
+ Link *nextlink = static_cast<Link *>(vnextlink);
+ Link *newlink = static_cast<Link *>(vnewlink);
/* newlink before nextlink */
- if (newlink == NULL) {
+ if (newlink == nullptr) {
return;
}
/* empty list */
- if (listbase->first == NULL) {
+ if (listbase->first == nullptr) {
listbase->first = newlink;
listbase->last = newlink;
return;
}
/* insert at end of list */
- if (nextlink == NULL) {
- newlink->prev = listbase->last;
- newlink->next = NULL;
+ if (nextlink == nullptr) {
+ newlink->prev = static_cast<Link *>(listbase->last);
+ newlink->next = nullptr;
((Link *)listbase->last)->next = newlink;
listbase->last = newlink;
return;
@@ -378,14 +378,14 @@ void BLI_insertlinkbefore(ListBase *listbase, void *vnextlink, void *vnewlink)
void BLI_insertlinkreplace(ListBase *listbase, void *vreplacelink, void *vnewlink)
{
- Link *l_old = vreplacelink;
- Link *l_new = vnewlink;
+ Link *l_old = static_cast<Link *>(vreplacelink);
+ Link *l_new = static_cast<Link *>(vnewlink);
/* update adjacent links */
- if (l_old->next != NULL) {
+ if (l_old->next != nullptr) {
l_old->next->prev = l_new;
}
- if (l_old->prev != NULL) {
+ if (l_old->prev != nullptr) {
l_old->prev->next = l_new;
}
@@ -404,7 +404,7 @@ void BLI_insertlinkreplace(ListBase *listbase, void *vreplacelink, void *vnewlin
bool BLI_listbase_link_move(ListBase *listbase, void *vlink, int step)
{
- Link *link = vlink;
+ Link *link = static_cast<Link *>(vlink);
Link *hook = link;
const bool is_up = step < 0;
@@ -453,7 +453,7 @@ void BLI_freelist(ListBase *listbase)
{
Link *link, *next;
- link = listbase->first;
+ link = static_cast<Link *>(listbase->first);
while (link) {
next = link->next;
free(link);
@@ -467,7 +467,7 @@ void BLI_freelistN(ListBase *listbase)
{
Link *link, *next;
- link = listbase->first;
+ link = static_cast<Link *>
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list