From f2a0062042edfafab2c0d9472f2669521ff70930 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Jun 2014 02:47:57 +1000 Subject: [PATCH] Use ARRAY_SIZE to replace (sizeof(a) / sizeof(*a)) --- source/blender/bmesh/intern/bmesh_opdefines.c | 2 +- source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 +- source/blender/bmesh/operators/bmo_subdivide.c | 2 +- source/blender/python/generic/py_capi_utils.c | 3 +-- source/blender/python/intern/bpy_app.c | 2 +- source/blender/python/intern/bpy_app_build_options.c | 4 +++- source/blender/python/intern/bpy_app_ffmpeg.c | 2 +- source/blender/python/intern/bpy_app_handlers.c | 4 ++-- source/blender/python/intern/bpy_app_ocio.c | 2 +- source/blender/python/intern/bpy_app_oiio.c | 2 +- source/blender/python/intern/bpy_app_translations.c | 4 ++-- source/blender/python/intern/bpy_interface.c | 2 +- source/blender/python/intern/bpy_intern_string.c | 4 ++-- 13 files changed, 18 insertions(+), 17 deletions(-) diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index f8cca0a3707..7c77302c942 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1904,4 +1904,4 @@ const BMOpDefine *bmo_opdefines[] = { &bmo_wireframe_def, }; -const int bmo_opdefines_total = (sizeof(bmo_opdefines) / sizeof(void *)); +const int bmo_opdefines_total = ARRAY_SIZE(bmo_opdefines); diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index c76c203c2fb..406dd412d6d 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -1352,4 +1352,4 @@ BMWalker *bm_walker_types[] = { &bmw_ConnectedVertexWalker_Type, /* BMW_CONNECTED_VERTEX */ }; -const int bm_totwalkers = sizeof(bm_walker_types) / sizeof(*bm_walker_types); +const int bm_totwalkers = ARRAY_SIZE(bm_walker_types); diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 4bc07c82c5c..fc507cdbd21 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -752,7 +752,7 @@ static const SubDPattern *patterns[] = { NULL, }; -#define PATTERNS_TOT (sizeof(patterns) / sizeof(void *)) +#define PATTERNS_TOT ARRAY_SIZE(patterns) typedef struct SubDFaceData { BMVert *start; diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index c0004789faa..54e27a30791 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -606,8 +606,7 @@ void PyC_SetHomePath(const char *py_path_bundle) /* cant use this, on linux gives bug: #23018, TODO: try LANG="en_US.UTF-8" /usr/bin/blender, suggested 22008 */ /* mbstowcs(py_path_bundle_wchar, py_path_bundle, FILE_MAXDIR); */ - BLI_strncpy_wchar_from_utf8(py_path_bundle_wchar, py_path_bundle, - sizeof(py_path_bundle_wchar) / sizeof(wchar_t)); + BLI_strncpy_wchar_from_utf8(py_path_bundle_wchar, py_path_bundle, ARRAY_SIZE(py_path_bundle_wchar)); Py_SetPythonHome(py_path_bundle_wchar); // printf("found python (wchar_t) '%ls'\n", py_path_bundle_wchar); diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 795015c42a0..6c4f8f0769f 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -107,7 +107,7 @@ static PyStructSequence_Desc app_info_desc = { (char *)"bpy.app", /* name */ (char *)"This module contains application values that remain unchanged during runtime.", /* doc */ app_info_fields, /* fields */ - (sizeof(app_info_fields) / sizeof(PyStructSequence_Field)) - 1 + ARRAY_SIZE(app_info_fields) - 1 }; static PyObject *make_app_info(void) diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c index f43b67cf42f..022713558d7 100644 --- a/source/blender/python/intern/bpy_app_build_options.c +++ b/source/blender/python/intern/bpy_app_build_options.c @@ -26,6 +26,8 @@ #include +#include "BLI_utildefines.h" + #include "bpy_app_build_options.h" static PyTypeObject BlenderAppBuildOptionsType; @@ -74,7 +76,7 @@ static PyStructSequence_Desc app_builtopts_info_desc = { (char *)"bpy.app.build_options", /* name */ (char *)"This module contains information about options blender is built with", /* doc */ app_builtopts_info_fields, /* fields */ - (sizeof(app_builtopts_info_fields) / sizeof(PyStructSequence_Field)) - 1 + ARRAY_SIZE(app_builtopts_info_fields) - 1 }; static PyObject *make_builtopts_info(void) diff --git a/source/blender/python/intern/bpy_app_ffmpeg.c b/source/blender/python/intern/bpy_app_ffmpeg.c index 2f7577928c5..fd516e4547f 100644 --- a/source/blender/python/intern/bpy_app_ffmpeg.c +++ b/source/blender/python/intern/bpy_app_ffmpeg.c @@ -60,7 +60,7 @@ static PyStructSequence_Desc app_ffmpeg_info_desc = { (char *)"bpy.app.ffmpeg", /* name */ (char *)"This module contains information about FFmpeg blender is linked against", /* doc */ app_ffmpeg_info_fields, /* fields */ - (sizeof(app_ffmpeg_info_fields) / sizeof(PyStructSequence_Field)) - 1 + ARRAY_SIZE(app_ffmpeg_info_fields) - 1 }; static PyObject *make_ffmpeg_info(void) diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c index b3be5a819fb..0c13230c365 100644 --- a/source/blender/python/intern/bpy_app_handlers.c +++ b/source/blender/python/intern/bpy_app_handlers.c @@ -71,11 +71,11 @@ static PyStructSequence_Desc app_cb_info_desc = { (char *)"bpy.app.handlers", /* name */ (char *)"This module contains callbacks", /* doc */ app_cb_info_fields, /* fields */ - (sizeof(app_cb_info_fields) / sizeof(PyStructSequence_Field)) - 1 + ARRAY_SIZE(app_cb_info_fields) - 1 }; #if 0 -# if (BLI_CB_EVT_TOT != ((sizeof(app_cb_info_fields) / sizeof(PyStructSequence_Field)))) +# if (BLI_CB_EVT_TOT != ARRAY_SIZE(app_cb_info_fields)) # error "Callbacks are out of sync" # endif #endif diff --git a/source/blender/python/intern/bpy_app_ocio.c b/source/blender/python/intern/bpy_app_ocio.c index eff52bc9dae..02e4044219a 100644 --- a/source/blender/python/intern/bpy_app_ocio.c +++ b/source/blender/python/intern/bpy_app_ocio.c @@ -46,7 +46,7 @@ static PyStructSequence_Desc app_ocio_info_desc = { (char *)"bpy.app.ocio", /* name */ (char *)"This module contains information about OpenColorIO blender is linked against", /* doc */ app_ocio_info_fields, /* fields */ - (sizeof(app_ocio_info_fields) / sizeof(PyStructSequence_Field)) - 1 + ARRAY_SIZE(app_ocio_info_fields) - 1 }; static PyObject *make_ocio_info(void) diff --git a/source/blender/python/intern/bpy_app_oiio.c b/source/blender/python/intern/bpy_app_oiio.c index b5f0f321c6d..60daf3ddd8b 100644 --- a/source/blender/python/intern/bpy_app_oiio.c +++ b/source/blender/python/intern/bpy_app_oiio.c @@ -46,7 +46,7 @@ static PyStructSequence_Desc app_oiio_info_desc = { (char *)"bpy.app.oiio", /* name */ (char *)"This module contains information about OpeImageIO blender is linked against", /* doc */ app_oiio_info_fields, /* fields */ - (sizeof(app_oiio_info_fields) / sizeof(PyStructSequence_Field)) - 1 + ARRAY_SIZE(app_oiio_info_fields) - 1 }; static PyObject *make_oiio_info(void) diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index e168bf33eb5..109e5606037 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -390,13 +390,13 @@ static BLF_i18n_contexts_descriptor _contexts[] = BLF_I18NCONTEXTS_DESC; * This allows us to avoid many handwriting, and above all, to keep all context definition stuff in BLF_translation.h! */ static PyStructSequence_Field -app_translations_contexts_fields[sizeof(_contexts) / sizeof(BLF_i18n_contexts_descriptor)] = {{NULL}}; +app_translations_contexts_fields[ARRAY_SIZE(_contexts)] = {{NULL}}; static PyStructSequence_Desc app_translations_contexts_desc = { (char *)"bpy.app.translations.contexts", /* name */ (char *)"This named tuple contains all pre-defined translation contexts", /* doc */ app_translations_contexts_fields, /* fields */ - (sizeof(app_translations_contexts_fields) / sizeof(PyStructSequence_Field)) - 1 + ARRAY_SIZE(app_translations_contexts_fields) - 1 }; static PyObject *app_translations_contexts_make(void) diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 045acc65d1e..bf2de02625f 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -243,7 +243,7 @@ void BPY_python_start(int argc, const char **argv) /* not essential but nice to set our name */ static wchar_t program_path_wchar[FILE_MAX]; /* python holds a reference */ - BLI_strncpy_wchar_from_utf8(program_path_wchar, BLI_program_path(), sizeof(program_path_wchar) / sizeof(wchar_t)); + BLI_strncpy_wchar_from_utf8(program_path_wchar, BLI_program_path(), ARRAY_SIZE(program_path_wchar)); Py_SetProgramName(program_path_wchar); /* must run before python initializes */ diff --git a/source/blender/python/intern/bpy_intern_string.c b/source/blender/python/intern/bpy_intern_string.c index 9c93af1786c..fd32c91a480 100644 --- a/source/blender/python/intern/bpy_intern_string.c +++ b/source/blender/python/intern/bpy_intern_string.c @@ -69,12 +69,12 @@ void bpy_intern_string_init(void) #undef BPY_INTERN_STR - BLI_assert(i == (sizeof(bpy_intern_str_arr) / sizeof(*bpy_intern_str_arr))); + BLI_assert(i == ARRAY_SIZE(bpy_intern_str_arr)); } void bpy_intern_string_exit(void) { - unsigned int i = sizeof(bpy_intern_str_arr) / sizeof(*bpy_intern_str_arr); + unsigned int i = ARRAY_SIZE(bpy_intern_str_arr); while (i--) { Py_DECREF(bpy_intern_str_arr[i]); }