diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/intern/addon.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/intern/addon.c')
-rw-r--r-- | source/blender/blenkernel/intern/addon.c | 97 |
1 files changed, 48 insertions, 49 deletions
diff --git a/source/blender/blenkernel/intern/addon.c b/source/blender/blenkernel/intern/addon.c index daeb572ce4a..486da61fe68 100644 --- a/source/blender/blenkernel/intern/addon.c +++ b/source/blender/blenkernel/intern/addon.c @@ -28,7 +28,7 @@ #include "BLI_string.h" #include "BLI_listbase.h" -#include "BKE_addon.h" /* own include */ +#include "BKE_addon.h" /* own include */ #include "BKE_idprop.h" #include "DNA_listBase.h" @@ -46,44 +46,44 @@ static CLG_LogRef LOG = {"bke.addon"}; bAddon *BKE_addon_new(void) { - bAddon *addon = MEM_callocN(sizeof(bAddon), "bAddon"); - return addon; + bAddon *addon = MEM_callocN(sizeof(bAddon), "bAddon"); + return addon; } bAddon *BKE_addon_find(ListBase *addon_list, const char *module) { - return BLI_findstring(addon_list, module, offsetof(bAddon, module)); + return BLI_findstring(addon_list, module, offsetof(bAddon, module)); } bAddon *BKE_addon_ensure(ListBase *addon_list, const char *module) { - bAddon *addon = BKE_addon_find(addon_list, module); - if (addon == NULL) { - addon = BKE_addon_new(); - BLI_strncpy(addon->module, module, sizeof(addon->module)); - BLI_addtail(addon_list, addon); - } - return addon; + bAddon *addon = BKE_addon_find(addon_list, module); + if (addon == NULL) { + addon = BKE_addon_new(); + BLI_strncpy(addon->module, module, sizeof(addon->module)); + BLI_addtail(addon_list, addon); + } + return addon; } bool BKE_addon_remove_safe(ListBase *addon_list, const char *module) { - bAddon *addon = BLI_findstring(addon_list, module, offsetof(bAddon, module)); - if (addon) { - BLI_remlink(addon_list, addon); - BKE_addon_free(addon); - return true; - } - return false; + bAddon *addon = BLI_findstring(addon_list, module, offsetof(bAddon, module)); + if (addon) { + BLI_remlink(addon_list, addon); + BKE_addon_free(addon); + return true; + } + return false; } void BKE_addon_free(bAddon *addon) { - if (addon->prop) { - IDP_FreeProperty(addon->prop); - MEM_freeN(addon->prop); - } - MEM_freeN(addon); + if (addon->prop) { + IDP_FreeProperty(addon->prop); + MEM_freeN(addon->prop); + } + MEM_freeN(addon); } /** \} */ @@ -94,50 +94,49 @@ void BKE_addon_free(bAddon *addon) static GHash *global_addonpreftype_hash = NULL; - bAddonPrefType *BKE_addon_pref_type_find(const char *idname, bool quiet) { - if (idname[0]) { - bAddonPrefType *apt; - - apt = BLI_ghash_lookup(global_addonpreftype_hash, idname); - if (apt) { - return apt; - } - - if (!quiet) { - CLOG_WARN(&LOG, "search for unknown addon-pref '%s'", idname); - } - } - else { - if (!quiet) { - CLOG_WARN(&LOG, "search for empty addon-pref"); - } - } - - return NULL; + if (idname[0]) { + bAddonPrefType *apt; + + apt = BLI_ghash_lookup(global_addonpreftype_hash, idname); + if (apt) { + return apt; + } + + if (!quiet) { + CLOG_WARN(&LOG, "search for unknown addon-pref '%s'", idname); + } + } + else { + if (!quiet) { + CLOG_WARN(&LOG, "search for empty addon-pref"); + } + } + + return NULL; } void BKE_addon_pref_type_add(bAddonPrefType *apt) { - BLI_ghash_insert(global_addonpreftype_hash, apt->idname, apt); + BLI_ghash_insert(global_addonpreftype_hash, apt->idname, apt); } void BKE_addon_pref_type_remove(const bAddonPrefType *apt) { - BLI_ghash_remove(global_addonpreftype_hash, apt->idname, NULL, MEM_freeN); + BLI_ghash_remove(global_addonpreftype_hash, apt->idname, NULL, MEM_freeN); } void BKE_addon_pref_type_init(void) { - BLI_assert(global_addonpreftype_hash == NULL); - global_addonpreftype_hash = BLI_ghash_str_new(__func__); + BLI_assert(global_addonpreftype_hash == NULL); + global_addonpreftype_hash = BLI_ghash_str_new(__func__); } void BKE_addon_pref_type_free(void) { - BLI_ghash_free(global_addonpreftype_hash, NULL, MEM_freeN); - global_addonpreftype_hash = NULL; + BLI_ghash_free(global_addonpreftype_hash, NULL, MEM_freeN); + global_addonpreftype_hash = NULL; } /** \} */ |