diff options
| author | Pheenoh <pheenoh@gmail.com> | 2020-12-26 11:31:49 -0500 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2020-12-26 11:31:49 -0500 |
| commit | 4c504d078d76ef66e0a24f8ce275a5ba40ef3b78 (patch) | |
| tree | cf7f23df04053c0895fd566f1f6c2d29852dff46 /include/SComponent | |
| parent | 64a6a97b7bfdd732e4b5053c51189fba5015210d (diff) | |
run clang-format
Diffstat (limited to 'include/SComponent')
| -rw-r--r-- | include/SComponent/c_bg_s_poly_info.h | 4 | ||||
| -rw-r--r-- | include/SComponent/c_list.h | 17 | ||||
| -rw-r--r-- | include/SComponent/c_list_iter.h | 5 | ||||
| -rw-r--r-- | include/SComponent/c_node.h | 33 | ||||
| -rw-r--r-- | include/SComponent/c_node_iter.h | 9 | ||||
| -rw-r--r-- | include/SComponent/c_phase.h | 26 | ||||
| -rw-r--r-- | include/SComponent/c_tag.h | 23 | ||||
| -rw-r--r-- | include/SComponent/c_tag_iter.h | 11 | ||||
| -rw-r--r-- | include/SComponent/c_tree.h | 13 | ||||
| -rw-r--r-- | include/SComponent/c_tree_iter.h | 7 |
10 files changed, 69 insertions, 79 deletions
diff --git a/include/SComponent/c_bg_s_poly_info.h b/include/SComponent/c_bg_s_poly_info.h index e484af1a93..e82aaade48 100644 --- a/include/SComponent/c_bg_s_poly_info.h +++ b/include/SComponent/c_bg_s_poly_info.h @@ -1,8 +1,6 @@ #ifndef C_BG_S_POLY_INFO_H_ #define C_BG_S_POLY_INFO_H_ -struct cBgS_PolyInfo{ - -}; +struct cBgS_PolyInfo {}; #endif
\ No newline at end of file diff --git a/include/SComponent/c_list.h b/include/SComponent/c_list.h index 7a7e6066c0..65cc47f1a0 100644 --- a/include/SComponent/c_list.h +++ b/include/SComponent/c_list.h @@ -5,20 +5,19 @@ #include "SComponent/c_node.h" struct node_list_class { - node_class *mpHead; - node_class *mpTail; + node_class* mpHead; + node_class* mpTail; int mSize; }; extern "C" { -void cLs_Init(node_list_class *pList); -int cLs_SingleCut(node_class *pNode); -int cLs_Addition(node_list_class *pList, node_class *pNode); -int cLs_Insert(node_list_class *pList, int idx, node_class *pNode); -node_class * cLs_GetFirst(node_list_class *pList); -void cLs_Create(node_list_class *pList); - +void cLs_Init(node_list_class* pList); +int cLs_SingleCut(node_class* pNode); +int cLs_Addition(node_list_class* pList, node_class* pNode); +int cLs_Insert(node_list_class* pList, int idx, node_class* pNode); +node_class* cLs_GetFirst(node_list_class* pList); +void cLs_Create(node_list_class* pList); }; #endif diff --git a/include/SComponent/c_list_iter.h b/include/SComponent/c_list_iter.h index 06c06590a9..3898341e79 100644 --- a/include/SComponent/c_list_iter.h +++ b/include/SComponent/c_list_iter.h @@ -7,9 +7,8 @@ extern "C" { -int cLsIt_Method(node_list_class *pList, cNdIt_MethodFunc pMethod, void *pUserData); -void * cLsIt_Judge(node_list_class *pList, cNdIt_JudgeFunc pJudge, void *pUserData); - +int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData); +void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData); }; #endif diff --git a/include/SComponent/c_node.h b/include/SComponent/c_node.h index 73573c0bae..dc3402dbfe 100644 --- a/include/SComponent/c_node.h +++ b/include/SComponent/c_node.h @@ -3,27 +3,26 @@ #define SCOMPONENT_C_NODE_H struct node_class { - node_class *mpPrevNode; - void *mpData; - node_class *mpNextNode; + node_class* mpPrevNode; + void* mpData; + node_class* mpNextNode; }; extern "C" { -void cNd_Join(node_class *pA, node_class *pB); -int cNd_LengthOf(node_class *pNode); -node_class * cNd_First(node_class *pNode); -node_class * cNd_Last(node_class *pNode); -node_class * cNd_Order(node_class *pNode, int idx); -void cNd_SingleCut(node_class *pNode); -void cNd_Cut(node_class *pNode); -void cNd_Addition(node_class *pA, node_class *pB); -void cNd_Insert(node_class *pA, node_class *pB); -void cNd_SetObject(node_class *pNode, void *pData); -void cNd_ClearObject(node_class *pNode); -void cNd_ForcedClear(node_class *pNode); -void cNd_Create(node_class *pNode, void *pData); - +void cNd_Join(node_class* pA, node_class* pB); +int cNd_LengthOf(node_class* pNode); +node_class* cNd_First(node_class* pNode); +node_class* cNd_Last(node_class* pNode); +node_class* cNd_Order(node_class* pNode, int idx); +void cNd_SingleCut(node_class* pNode); +void cNd_Cut(node_class* pNode); +void cNd_Addition(node_class* pA, node_class* pB); +void cNd_Insert(node_class* pA, node_class* pB); +void cNd_SetObject(node_class* pNode, void* pData); +void cNd_ClearObject(node_class* pNode); +void cNd_ForcedClear(node_class* pNode); +void cNd_Create(node_class* pNode, void* pData); }; #endif diff --git a/include/SComponent/c_node_iter.h b/include/SComponent/c_node_iter.h index 8d76321c05..2a58390380 100644 --- a/include/SComponent/c_node_iter.h +++ b/include/SComponent/c_node_iter.h @@ -6,12 +6,11 @@ extern "C" { -typedef int (*cNdIt_MethodFunc)(node_class *pNode, void *pUserData); -int cNdIt_Method(node_class *pNode, cNdIt_MethodFunc pMethod, void *pUserData); - -typedef void * (*cNdIt_JudgeFunc)(node_class *pNode, void *pUserData); -void * cNdIt_Judge(node_class *pNode, cNdIt_JudgeFunc pJudge, void *pUserData); +typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData); +int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData); +typedef void* (*cNdIt_JudgeFunc)(node_class* pNode, void* pUserData); +void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData); }; #endif diff --git a/include/SComponent/c_phase.h b/include/SComponent/c_phase.h index c923711dd4..2c9e399071 100644 --- a/include/SComponent/c_phase.h +++ b/include/SComponent/c_phase.h @@ -2,31 +2,31 @@ #ifndef SCOMPONENT_C_PHASE_H #define SCOMPONENT_C_PHASE_H -typedef int (*cPhs__Handler)(void *); +typedef int (*cPhs__Handler)(void*); enum cPhs__Step { - cPhs_ZERO_e = 0x00, + cPhs_ZERO_e = 0x00, // names from Wind Waker debug strings cPhs_COMPLEATE_e = 0x04, - cPhs_ERROR_e = 0x05, - cPhs_NEXT_e = 0x06, + cPhs_ERROR_e = 0x05, + cPhs_NEXT_e = 0x06, }; struct request_of_phase_process_class { - cPhs__Handler *mpHandlerTable; + cPhs__Handler* mpHandlerTable; int mPhaseStep; }; extern "C" { -void cPhs_Reset(request_of_phase_process_class *pPhase); -void cPhs_Set(request_of_phase_process_class *pPhase, cPhs__Handler *pHandlerTable); -void cPhs_UnCompleate(request_of_phase_process_class *pPhase); -int cPhs_Compleate(request_of_phase_process_class *pPhase); -int cPhs_Next(request_of_phase_process_class *pPhase); -int cPhs_Do(request_of_phase_process_class *pPhase, void *pUserData); -int cPhs_Handler(request_of_phase_process_class *pPhase, cPhs__Handler *pHandlerTable, void *pUserData); - +void cPhs_Reset(request_of_phase_process_class* pPhase); +void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable); +void cPhs_UnCompleate(request_of_phase_process_class* pPhase); +int cPhs_Compleate(request_of_phase_process_class* pPhase); +int cPhs_Next(request_of_phase_process_class* pPhase); +int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData); +int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable, + void* pUserData); }; #endif diff --git a/include/SComponent/c_tag.h b/include/SComponent/c_tag.h index 316a5ee4b2..22c26c25c9 100644 --- a/include/SComponent/c_tag.h +++ b/include/SComponent/c_tag.h @@ -2,28 +2,27 @@ #ifndef SCOMPONENT_C_TAG_H #define SCOMPONENT_C_TAG_H -#include "global.h" -#include "SComponent/c_node.h" #include "SComponent/c_list.h" +#include "SComponent/c_node.h" #include "SComponent/c_tree.h" +#include "global.h" struct create_tag_class { node_class mpNode; - void *mpTagData; + void* mpTagData; s8 mbIsUse; }; extern "C" { -int cTg_IsUse(create_tag_class *pTag); -int cTg_SingleCutFromTree(create_tag_class *pTag); -int cTg_AdditionToTree(node_lists_tree_class *pTree, int listIdx, create_tag_class *pTag); -int cTg_InsertToTree(node_lists_tree_class *pTree, int listIdx, create_tag_class *pTag, int idx); -node_class * cTg_GetFirst(node_list_class *pTag); -int cTg_SingleCut(create_tag_class *pTag); -int cTg_Addition(node_list_class *pList, create_tag_class *pTag); -void cTg_Create(create_tag_class *pTag, void *pData); - +int cTg_IsUse(create_tag_class* pTag); +int cTg_SingleCutFromTree(create_tag_class* pTag); +int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag); +int cTg_InsertToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag, int idx); +node_class* cTg_GetFirst(node_list_class* pTag); +int cTg_SingleCut(create_tag_class* pTag); +int cTg_Addition(node_list_class* pList, create_tag_class* pTag); +void cTg_Create(create_tag_class* pTag, void* pData); }; #endif diff --git a/include/SComponent/c_tag_iter.h b/include/SComponent/c_tag_iter.h index b750ac9c76..022752458f 100644 --- a/include/SComponent/c_tag_iter.h +++ b/include/SComponent/c_tag_iter.h @@ -2,24 +2,23 @@ #ifndef SCOMPONENT_C_TAG_ITER_H #define SCOMPONENT_C_TAG_ITER_H -#include "SComponent/c_tag.h" #include "SComponent/c_node_iter.h" +#include "SComponent/c_tag.h" struct method_filter { cNdIt_MethodFunc mpMethodFunc; - void *mpUserData; + void* mpUserData; }; struct judge_filter { cNdIt_JudgeFunc mpJudgeFunc; - void *mpUserData; + void* mpUserData; }; extern "C" { -int cTgIt_MethodCall(create_tag_class *pTag, method_filter *pMethodFilter); -void * cTgIt_JudgeFilter(create_tag_class *pTag, judge_filter *pJudgeFilter); - +int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter); +void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter); }; #endif diff --git a/include/SComponent/c_tree.h b/include/SComponent/c_tree.h index 215b5a58e4..8fb3ed7e49 100644 --- a/include/SComponent/c_tree.h +++ b/include/SComponent/c_tree.h @@ -2,22 +2,21 @@ #ifndef SCOMPONENT_C_TREE_H #define SCOMPONENT_C_TREE_H -#include "global.h" #include "SComponent/c_list.h" #include "SComponent/c_node.h" +#include "global.h" struct node_lists_tree_class { - node_list_class *mpLists; + node_list_class* mpLists; int mNumLists; }; extern "C" { -int cTr_SingleCut(node_class *pNode); -int cTr_Addition(node_lists_tree_class *pTree, int listIdx, node_class *pNode); -int cTr_Insert(node_lists_tree_class *pTree, int listIdx, node_class *pNode, int idx); -void cTr_Create(node_lists_tree_class *pTree, node_list_class *pLists, int numLists); - +int cTr_SingleCut(node_class* pNode); +int cTr_Addition(node_lists_tree_class* pTree, int listIdx, node_class* pNode); +int cTr_Insert(node_lists_tree_class* pTree, int listIdx, node_class* pNode, int idx); +void cTr_Create(node_lists_tree_class* pTree, node_list_class* pLists, int numLists); }; #endif diff --git a/include/SComponent/c_tree_iter.h b/include/SComponent/c_tree_iter.h index 0334500efe..438a142474 100644 --- a/include/SComponent/c_tree_iter.h +++ b/include/SComponent/c_tree_iter.h @@ -2,14 +2,13 @@ #ifndef SCOMPONENT_C_TREE_ITER_H #define SCOMPONENT_C_TREE_ITER_H -#include "SComponent/c_tree.h" #include "SComponent/c_node_iter.h" +#include "SComponent/c_tree.h" extern "C" { -int cTrIt_Method(node_lists_tree_class *pTree, cNdIt_MethodFunc pJudgeFunc, void *pUserData); -void * cTrIt_Judge(node_lists_tree_class *pTree, cNdIt_JudgeFunc pJudgeFunc, void *pUserData); - +int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData); +void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData); }; #endif |
