diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-08-08 06:29:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-08 06:38:00 +0300 |
commit | 171e77c3c25a1224fc5f7db40ec6f8879f8dbbb0 (patch) | |
tree | ea51f4fa508a39807e6f6d333b2d53af8a2b9fc1 /source/blender/makesrna | |
parent | 4bf3ca20165959f98c7c830a138ba2901d3dd851 (diff) |
Cleanup: use array syntax for sizeof with fixed values
Also order sizeof(..) first to promote other values to size_t.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index bb791dd6e2d..e94dad59176 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -4384,7 +4384,7 @@ void RNA_enum_item_add(EnumPropertyItem **items, int *totitem, const EnumPropert int tot = *totitem; if (tot == 0) { - *items = MEM_callocN(sizeof(EnumPropertyItem) * 8, __func__); + *items = MEM_callocN(sizeof(EnumPropertyItem[8]), __func__); } else if (tot >= 8 && (tot & (tot - 1)) == 0) { /* power of two > 8 */ diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 27297a4d19a..b8500264e12 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -815,7 +815,7 @@ static void rna_trackingCameras_matrix_from_frame(ID *id, MovieTrackingObject *object = find_object_for_reconstruction(tracking, reconstruction); BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat); - memcpy(matrix, mat, sizeof(float) * 16); + memcpy(matrix, mat, sizeof(float[4][4])); } #else diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 0567b22d23f..90873fa73f4 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1088,7 +1088,7 @@ int rna_show_statusbar_vram_editable(struct PointerRNA *UNUSED(ptr), const char static size_t max_memory_in_megabytes(void) { /* Maximum addressable bytes on this platform. */ - const size_t limit_bytes = (((size_t)1) << ((sizeof(size_t) * 8) - 1)); + const size_t limit_bytes = (((size_t)1) << ((sizeof(size_t[8])) - 1)); /* Convert it to megabytes and return. */ return (limit_bytes >> 20); } |