diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index ed5b2e168bb..a596ba245ac 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -210,7 +210,10 @@ struct BHeadN { /** \name Blend Loader Reporting Wrapper * \{ */ -void BLO_reportf_wrap(BlendFileReadReport *reports, eReportType type, const char *format, ...) +void BLO_reportf_wrap(BlendFileReadReport *reports, + const eReportType type, + const char *format, + ...) { char fixed_buf[1024]; /* should be long enough */ @@ -261,7 +264,7 @@ static OldNewMap *oldnewmap_new() * \return `true` if the \a oldaddr key has been successfully added to the \a onm, and no existing * entry was overwritten. */ -static bool oldnewmap_insert(OldNewMap *onm, const void *oldaddr, void *newaddr, int nr) +static bool oldnewmap_insert(OldNewMap *onm, const void *oldaddr, void *newaddr, const int nr) { if (oldaddr == nullptr || newaddr == nullptr) { return false; @@ -270,17 +273,20 @@ static bool oldnewmap_insert(OldNewMap *onm, const void *oldaddr, void *newaddr, return onm->map.add_overwrite(oldaddr, NewAddress{newaddr, nr}); } -static void oldnewmap_lib_insert(FileData *fd, const void *oldaddr, ID *newaddr, int id_code) +static void oldnewmap_lib_insert(FileData *fd, const void *oldaddr, ID *newaddr, const int id_code) { oldnewmap_insert(fd->libmap, oldaddr, newaddr, id_code); } -void blo_do_versions_oldnewmap_insert(OldNewMap *onm, const void *oldaddr, void *newaddr, int nr) +void blo_do_versions_oldnewmap_insert(OldNewMap *onm, + const void *oldaddr, + void *newaddr, + const int nr) { oldnewmap_insert(onm, oldaddr, newaddr, nr); } -static void *oldnewmap_lookup_and_inc(OldNewMap *onm, const void *addr, bool increase_users) +static void *oldnewmap_lookup_and_inc(OldNewMap *onm, const void *addr, const bool increase_users) { NewAddress *entry = onm->map.lookup_ptr(addr); if (entry == nullptr) { @@ -652,7 +658,7 @@ static void switch_endian_bh8(BHead8 *bhead) } } -static void bh4_from_bh8(BHead *bhead, BHead8 *bhead8, bool do_endian_swap) +static void bh4_from_bh8(BHead *bhead, BHead8 *bhead8, const bool do_endian_swap) { BHead4 *bhead4 = (BHead4 *)bhead; int64_t old; @@ -1200,7 +1206,7 @@ static FileData *blo_decode_and_check(FileData *fd, ReportList *reports) static FileData *blo_filedata_from_file_descriptor(const char *filepath, BlendFileReadReport *reports, - int filedes) + const int filedes) { char header[7]; FileReader *rawfile = BLI_filereader_new_file(filedes); @@ -1309,7 +1315,9 @@ static FileData *blo_filedata_from_file_minimal(const char *filepath) return nullptr; } -FileData *blo_filedata_from_memory(const void *mem, int memsize, BlendFileReadReport *reports) +FileData *blo_filedata_from_memory(const void *mem, + const int memsize, + BlendFileReadReport *reports) { if (!mem || memsize < SIZEOFBLENDERHEADER) { BKE_report( @@ -1570,7 +1578,7 @@ static void blo_cache_storage_entry_register( /** Restore a cache data entry from old ID into new one, when reading some undo memfile. */ static void blo_cache_storage_entry_restore_in_new( - ID *id, const IDCacheKey *key, void **cache_p, uint flags, void *cache_storage_v) + ID *id, const IDCacheKey *key, void **cache_p, const uint flags, void *cache_storage_v) { BLOCacheStorage *cache_storage = static_cast(cache_storage_v); @@ -1604,8 +1612,11 @@ static void blo_cache_storage_entry_restore_in_new( } /** Clear as needed a cache data entry from old ID, when reading some undo memfile. */ -static void blo_cache_storage_entry_clear_in_old( - ID * /*id*/, const IDCacheKey *key, void **cache_p, uint /*flags*/, void *cache_storage_v) +static void blo_cache_storage_entry_clear_in_old(ID * /*id*/, + const IDCacheKey *key, + void **cache_p, + const uint /*flags*/, + void *cache_storage_v) { BLOCacheStorage *cache_storage = static_cast(cache_storage_v); @@ -1731,7 +1742,7 @@ static void switch_endian_structs(const SDNA *filesdna, BHead *bhead) static const char *get_alloc_name(FileData *fd, BHead *bh, const char *blockname, - int id_type_index = INDEX_ID_NULL) + const int id_type_index = INDEX_ID_NULL) { #ifndef NDEBUG /* Storage key is a pair of (string , int), where the first is the concatenation of the 'owner @@ -2775,7 +2786,7 @@ static void read_libblock_undo_restore_at_old_address(FileData *fd, Main *main, } static bool read_libblock_undo_restore( - FileData *fd, Main *main, BHead *bhead, int id_tag, ID **r_id_old) + FileData *fd, Main *main, BHead *bhead, const int id_tag, ID **r_id_old) { BLI_assert(fd->old_idmap_uid != nullptr); @@ -4908,7 +4919,7 @@ ID *BLO_read_get_new_id_address(BlendLibReader *reader, return static_cast(newlibadr(reader->fd, self_id, is_linked_only, id)); } -ID *BLO_read_get_new_id_address_from_session_uid(BlendLibReader *reader, uint session_uid) +ID *BLO_read_get_new_id_address_from_session_uid(BlendLibReader *reader, const uint session_uid) { return BKE_main_idmap_lookup_uid(reader->fd->new_idmap_uid, session_uid); } @@ -4944,25 +4955,25 @@ void BLO_read_struct_list_with_size(BlendDataReader *reader, list->last = prev; } -void BLO_read_char_array(BlendDataReader *reader, int array_size, char **ptr_p) +void BLO_read_char_array(BlendDataReader *reader, const int array_size, char **ptr_p) { *ptr_p = reinterpret_cast( BLO_read_struct_array_with_size(reader, *((void **)ptr_p), sizeof(char) * array_size)); } -void BLO_read_uint8_array(BlendDataReader *reader, int array_size, uint8_t **ptr_p) +void BLO_read_uint8_array(BlendDataReader *reader, const int array_size, uint8_t **ptr_p) { *ptr_p = reinterpret_cast( BLO_read_struct_array_with_size(reader, *((void **)ptr_p), sizeof(uint8_t) * array_size)); } -void BLO_read_int8_array(BlendDataReader *reader, int array_size, int8_t **ptr_p) +void BLO_read_int8_array(BlendDataReader *reader, const int array_size, int8_t **ptr_p) { *ptr_p = reinterpret_cast( BLO_read_struct_array_with_size(reader, *((void **)ptr_p), sizeof(int8_t) * array_size)); } -void BLO_read_int32_array(BlendDataReader *reader, int array_size, int32_t **ptr_p) +void BLO_read_int32_array(BlendDataReader *reader, const int array_size, int32_t **ptr_p) { *ptr_p = reinterpret_cast( BLO_read_struct_array_with_size(reader, *((void **)ptr_p), sizeof(int32_t) * array_size)); @@ -4972,7 +4983,7 @@ void BLO_read_int32_array(BlendDataReader *reader, int array_size, int32_t **ptr } } -void BLO_read_uint32_array(BlendDataReader *reader, int array_size, uint32_t **ptr_p) +void BLO_read_uint32_array(BlendDataReader *reader, const int array_size, uint32_t **ptr_p) { *ptr_p = reinterpret_cast( BLO_read_struct_array_with_size(reader, *((void **)ptr_p), sizeof(uint32_t) * array_size)); @@ -4982,7 +4993,7 @@ void BLO_read_uint32_array(BlendDataReader *reader, int array_size, uint32_t **p } } -void BLO_read_float_array(BlendDataReader *reader, int array_size, float **ptr_p) +void BLO_read_float_array(BlendDataReader *reader, const int array_size, float **ptr_p) { *ptr_p = reinterpret_cast( BLO_read_struct_array_with_size(reader, *((void **)ptr_p), sizeof(float) * array_size)); @@ -4992,12 +5003,12 @@ void BLO_read_float_array(BlendDataReader *reader, int array_size, float **ptr_p } } -void BLO_read_float3_array(BlendDataReader *reader, int array_size, float **ptr_p) +void BLO_read_float3_array(BlendDataReader *reader, const int array_size, float **ptr_p) { BLO_read_float_array(reader, array_size * 3, ptr_p); } -void BLO_read_double_array(BlendDataReader *reader, int array_size, double **ptr_p) +void BLO_read_double_array(BlendDataReader *reader, const int array_size, double **ptr_p) { *ptr_p = reinterpret_cast( BLO_read_struct_array_with_size(reader, *((void **)ptr_p), sizeof(double) * array_size)); @@ -5037,7 +5048,7 @@ void BLO_read_string(BlendDataReader *reader, const char **ptr_p) } static void convert_pointer_array_64_to_32(BlendDataReader *reader, - uint array_size, + const uint array_size, const uint64_t *src, uint32_t *dst) { @@ -5057,7 +5068,7 @@ static void convert_pointer_array_64_to_32(BlendDataReader *reader, } static void convert_pointer_array_32_to_64(BlendDataReader * /*reader*/, - uint array_size, + const uint array_size, const uint32_t *src, uint64_t *dst) { diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index 6e1e3577783..864b3952b92 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -301,7 +301,7 @@ bool ZstdWriteWrap::open(const char *filepath) return true; } -void ZstdWriteWrap::write_u32_le(uint32_t val) +void ZstdWriteWrap::write_u32_le(const uint32_t val) { #ifdef __BIG_ENDIAN__ BLI_endian_switch_uint32(&val); @@ -356,7 +356,7 @@ bool ZstdWriteWrap::close() return base_wrap.close() && !write_error; } -bool ZstdWriteWrap::write(const void *buf, size_t buf_len) +bool ZstdWriteWrap::write(const void *buf, const size_t buf_len) { if (write_error) { return false; @@ -482,7 +482,7 @@ static WriteData *writedata_new(WriteWrap *ww) return wd; } -static void writedata_do_write(WriteData *wd, const void *mem, size_t memlen) +static void writedata_do_write(WriteData *wd, const void *mem, const size_t memlen) { if ((wd == nullptr) || wd->validation_data.critical_error || (mem == nullptr) || memlen < 1) { return; @@ -567,7 +567,7 @@ static void mywrite(WriteData *wd, const void *adr, size_t len) } do { - size_t writelen = std::min(len, wd->buffer.chunk_size); + const size_t writelen = std::min(len, wd->buffer.chunk_size); writedata_do_write(wd, adr, writelen); adr = (const char *)adr + writelen; len -= writelen; @@ -701,7 +701,7 @@ static void mywrite_id_end(WriteData *wd, ID * /*id*/) * \note Currently only checks that #BLO_CODE_DATA blocks written as part of an ID data never match * an already written one for the same ID. */ -static bool write_at_address_validate(WriteData *wd, int filecode, const void *address) +static bool write_at_address_validate(WriteData *wd, const int filecode, const void *address) { /* Skip in undo case. */ if (wd->use_memfile) { @@ -719,8 +719,12 @@ static bool write_at_address_validate(WriteData *wd, int filecode, const void *a return true; } -static void writestruct_at_address_nr( - WriteData *wd, int filecode, const int struct_nr, int nr, const void *adr, const void *data) +static void writestruct_at_address_nr(WriteData *wd, + const int filecode, + const int struct_nr, + const int nr, + const void *adr, + const void *data) { BHead bh; @@ -751,7 +755,7 @@ static void writestruct_at_address_nr( } static void writestruct_nr( - WriteData *wd, int filecode, const int struct_nr, int nr, const void *adr) + WriteData *wd, const int filecode, const int struct_nr, const int nr, const void *adr) { writestruct_at_address_nr(wd, filecode, struct_nr, nr, adr, adr); } @@ -759,7 +763,7 @@ static void writestruct_nr( /** * \warning Do not use for structs. */ -static void writedata(WriteData *wd, int filecode, size_t len, const void *adr) +static void writedata(WriteData *wd, const int filecode, const size_t len, const void *adr) { BHead bh; @@ -791,7 +795,10 @@ static void writedata(WriteData *wd, int filecode, size_t len, const void *adr) /** * Use this to force writing of lists in same order as reading (using link_list). */ -static void writelist_nr(WriteData *wd, int filecode, const int struct_nr, const ListBase *lb) +static void writelist_nr(WriteData *wd, + const int filecode, + const int struct_nr, + const ListBase *lb) { const Link *link = static_cast(lb->first); @@ -802,7 +809,7 @@ static void writelist_nr(WriteData *wd, int filecode, const int struct_nr, const } #if 0 -static void writelist_id(WriteData *wd, int filecode, const char *structname, const ListBase *lb) +static void writelist_id(WriteData *wd, const int filecode, const char *structname, const ListBase *lb) { const Link *link = lb->first; if (link) { @@ -840,7 +847,7 @@ static void writelist_id(WriteData *wd, int filecode, const char *structname, co * to change which scene renders (currently only used for undo). */ static void current_screen_compat(Main *mainvar, - bool use_active_win, + const bool use_active_win, bScreen **r_screen, Scene **r_scene, ViewLayer **r_view_layer) @@ -1104,7 +1111,7 @@ extern "C" char build_hash[]; * - for forward compatibility, `curscreen` has to be saved * - for undo-file, `curscene` needs to be saved. */ -static void write_global(WriteData *wd, int fileflags, Main *mainvar) +static void write_global(WriteData *wd, const int fileflags, Main *mainvar) { const bool is_undo = wd->use_memfile; FileGlobal fg; @@ -1295,8 +1302,8 @@ static bool write_file_handle(Main *mainvar, WriteWrap *ww, MemFile *compare, MemFile *current, - int write_flags, - bool use_userdef, + const int write_flags, + const bool use_userdef, const BlendThumbnail *thumb) { BHead bhead; @@ -1774,7 +1781,7 @@ bool BLO_write_file(Main *mainvar, return BLO_write_file_impl(mainvar, filepath, write_flags, params, reports, raw_wrap); } -bool BLO_write_file_mem(Main *mainvar, MemFile *compare, MemFile *current, int write_flags) +bool BLO_write_file_mem(Main *mainvar, MemFile *compare, MemFile *current, const int write_flags) { bool use_userdef = false; @@ -1817,7 +1824,7 @@ void BLO_write_destroy_id_buffer(BLO_Write_IDBuffer **id_buffer) * API to write chunks of data. */ -void BLO_write_raw(BlendWriter *writer, size_t size_in_bytes, const void *data_ptr) +void BLO_write_raw(BlendWriter *writer, const size_t size_in_bytes, const void *data_ptr) { writedata(writer->wd, BLO_CODE_DATA, size_in_bytes, data_ptr); } @@ -1829,7 +1836,7 @@ void BLO_write_struct_by_name(BlendWriter *writer, const char *struct_name, cons void BLO_write_struct_array_by_name(BlendWriter *writer, const char *struct_name, - int array_size, + const int array_size, const void *data_ptr) { int struct_id = BLO_get_struct_id_by_name(writer, struct_name); @@ -1840,13 +1847,13 @@ void BLO_write_struct_array_by_name(BlendWriter *writer, BLO_write_struct_array_by_id(writer, struct_id, array_size, data_ptr); } -void BLO_write_struct_by_id(BlendWriter *writer, int struct_id, const void *data_ptr) +void BLO_write_struct_by_id(BlendWriter *writer, const int struct_id, const void *data_ptr) { writestruct_nr(writer->wd, BLO_CODE_DATA, struct_id, 1, data_ptr); } void BLO_write_struct_at_address_by_id(BlendWriter *writer, - int struct_id, + const int struct_id, const void *address, const void *data_ptr) { @@ -1854,27 +1861,33 @@ void BLO_write_struct_at_address_by_id(BlendWriter *writer, writer, BLO_CODE_DATA, struct_id, address, data_ptr); } -void BLO_write_struct_at_address_by_id_with_filecode( - BlendWriter *writer, int filecode, int struct_id, const void *address, const void *data_ptr) +void BLO_write_struct_at_address_by_id_with_filecode(BlendWriter *writer, + const int filecode, + const int struct_id, + const void *address, + const void *data_ptr) { writestruct_at_address_nr(writer->wd, filecode, struct_id, 1, address, data_ptr); } void BLO_write_struct_array_by_id(BlendWriter *writer, - int struct_id, - int array_size, + const int struct_id, + const int array_size, const void *data_ptr) { writestruct_nr(writer->wd, BLO_CODE_DATA, struct_id, array_size, data_ptr); } -void BLO_write_struct_array_at_address_by_id( - BlendWriter *writer, int struct_id, int array_size, const void *address, const void *data_ptr) +void BLO_write_struct_array_at_address_by_id(BlendWriter *writer, + const int struct_id, + const int array_size, + const void *address, + const void *data_ptr) { writestruct_at_address_nr(writer->wd, BLO_CODE_DATA, struct_id, array_size, address, data_ptr); } -void BLO_write_struct_list_by_id(BlendWriter *writer, int struct_id, const ListBase *list) +void BLO_write_struct_list_by_id(BlendWriter *writer, const int struct_id, const ListBase *list) { writelist_nr(writer->wd, BLO_CODE_DATA, struct_id, list); } @@ -1889,7 +1902,10 @@ void BLO_write_struct_list_by_name(BlendWriter *writer, const char *struct_name, BLO_write_struct_list_by_id(writer, struct_id, list); } -void blo_write_id_struct(BlendWriter *writer, int struct_id, const void *id_address, const ID *id) +void blo_write_id_struct(BlendWriter *writer, + const int struct_id, + const void *id_address, + const ID *id) { writestruct_at_address_nr(writer->wd, GS(id->name), struct_id, 1, id_address, id); } @@ -1900,47 +1916,47 @@ int BLO_get_struct_id_by_name(const BlendWriter *writer, const char *struct_name return struct_id; } -void BLO_write_char_array(BlendWriter *writer, uint num, const char *data_ptr) +void BLO_write_char_array(BlendWriter *writer, const uint num, const char *data_ptr) { BLO_write_raw(writer, sizeof(char) * size_t(num), data_ptr); } -void BLO_write_int8_array(BlendWriter *writer, uint num, const int8_t *data_ptr) +void BLO_write_int8_array(BlendWriter *writer, const uint num, const int8_t *data_ptr) { BLO_write_raw(writer, sizeof(int8_t) * size_t(num), data_ptr); } -void BLO_write_uint8_array(BlendWriter *writer, uint num, const uint8_t *data_ptr) +void BLO_write_uint8_array(BlendWriter *writer, const uint num, const uint8_t *data_ptr) { BLO_write_raw(writer, sizeof(uint8_t) * size_t(num), data_ptr); } -void BLO_write_int32_array(BlendWriter *writer, uint num, const int32_t *data_ptr) +void BLO_write_int32_array(BlendWriter *writer, const uint num, const int32_t *data_ptr) { BLO_write_raw(writer, sizeof(int32_t) * size_t(num), data_ptr); } -void BLO_write_uint32_array(BlendWriter *writer, uint num, const uint32_t *data_ptr) +void BLO_write_uint32_array(BlendWriter *writer, const uint num, const uint32_t *data_ptr) { BLO_write_raw(writer, sizeof(uint32_t) * size_t(num), data_ptr); } -void BLO_write_float_array(BlendWriter *writer, uint num, const float *data_ptr) +void BLO_write_float_array(BlendWriter *writer, const uint num, const float *data_ptr) { BLO_write_raw(writer, sizeof(float) * size_t(num), data_ptr); } -void BLO_write_double_array(BlendWriter *writer, uint num, const double *data_ptr) +void BLO_write_double_array(BlendWriter *writer, const uint num, const double *data_ptr) { BLO_write_raw(writer, sizeof(double) * size_t(num), data_ptr); } -void BLO_write_pointer_array(BlendWriter *writer, uint num, const void *data_ptr) +void BLO_write_pointer_array(BlendWriter *writer, const uint num, const void *data_ptr) { BLO_write_raw(writer, sizeof(void *) * size_t(num), data_ptr); } -void BLO_write_float3_array(BlendWriter *writer, uint num, const float *data_ptr) +void BLO_write_float3_array(BlendWriter *writer, const uint num, const float *data_ptr) { BLO_write_raw(writer, sizeof(float[3]) * size_t(num), data_ptr); }