bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: match function/declaration names

Browse Source
This commit is contained in:
Campbell Barton 2024-04-17 11:36:36 +10:00
parent bfc8477a42
commit 8680976dc9
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/clog/clog.c
View File

@ -171,7 +171,7 @@ static void clg_str_append(CLogStringBuf *cstr, const char *str)
}
ATTR_PRINTF_FORMAT(2, 0)
static void clg_str_vappendf(CLogStringBuf *cstr, const char *fmt, va_list args)
static void clg_str_vappendf(CLogStringBuf *cstr, const char *format, va_list args)
{
/* Use limit because windows may use '-1' for a formatting error. */
const uint len_max = 65535;
@ -179,7 +179,7 @@ static void clg_str_vappendf(CLogStringBuf *cstr, const char *fmt, va_list args)
while (true) {
va_list args_cpy;
va_copy(args_cpy, args);
int retval = vsnprintf(cstr->data + cstr->len, len_avail, fmt, args_cpy);
int retval = vsnprintf(cstr->data + cstr->len, len_avail, format, args_cpy);
va_end(args_cpy);
if (retval < 0) {
@ -502,7 +502,7 @@ void CLG_logf(const CLG_LogType *lg,
enum CLG_Severity severity,
const char *file_line,
const char *fn,
const char *fmt,
const char *format,
...)
{
CLogStringBuf cstr;
@ -520,8 +520,8 @@ void CLG_logf(const CLG_LogType *lg,
write_file_line_fn(&cstr, file_line, fn, lg->ctx->use_basename);
va_list ap;
va_start(ap, fmt);
clg_str_vappendf(&cstr, fmt, ap);
va_start(ap, format);
clg_str_vappendf(&cstr, format, ap);
va_end(ap);
}
clg_str_append(&cstr, "\n");

6
source/blender/blenkernel/BKE_pointcache.h
View File

@ -296,9 +296,9 @@ bool BKE_ptcache_object_has(struct Scene *scene, struct Object *ob, int duplis);
/************ ID specific functions ************************/
void BKE_ptcache_id_clear(PTCacheID *id, int mode, unsigned int cfra);
bool BKE_ptcache_id_exist(PTCacheID *id, int cfra);
int BKE_ptcache_id_reset(struct Scene *scene, PTCacheID *id, int mode);
void BKE_ptcache_id_clear(PTCacheID *pid, int mode, unsigned int cfra);
bool BKE_ptcache_id_exist(PTCacheID *pid, int cfra);
int BKE_ptcache_id_reset(struct Scene *scene, PTCacheID *pid, int mode);
void BKE_ptcache_id_time(PTCacheID *pid,
struct Scene *scene,
float cfra,

3
source/blender/blenlib/BLI_fileops.h
View File

@ -380,7 +380,8 @@ bool BLI_file_older(const char *file1, const char *file2) ATTR_WARN_UNUSED_RESUL
*
* \return the lines in a linked list (an empty list when file reading fails).
*/
struct LinkNode *BLI_file_read_as_lines(const char *file) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
struct LinkNode *BLI_file_read_as_lines(const char *filepath) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL();
/**
* Read the contents of `fp`, returning the result as a buffer or null when it can't be read.

2
source/blender/blenlib/BLI_ghash.h
View File

@ -394,7 +394,7 @@ bool BLI_gset_ensure_p_ex(GSet *gs, const void *key, void ***r_key);
*
* \returns true if a new key has been added.
*/
bool BLI_gset_reinsert(GSet *gh, void *key, GSetKeyFreeFP keyfreefp);
bool BLI_gset_reinsert(GSet *gs, void *key, GSetKeyFreeFP keyfreefp);
/**
* Replaces the key to the set if it's found.
* Matching #BLI_ghash_replace_key

2
source/blender/makesrna/RNA_define.hh
View File

@ -434,7 +434,7 @@ void RNA_def_property_ui_text(PropertyRNA *prop, const char *name, const char *d
*/
void RNA_def_property_ui_range(
PropertyRNA *prop, double min, double max, double step, int precision);
void RNA_def_property_ui_scale_type(PropertyRNA *prop, PropertyScaleType scale_type);
void RNA_def_property_ui_scale_type(PropertyRNA *prop, PropertyScaleType ui_scale_type);
void RNA_def_property_ui_icon(PropertyRNA *prop, int icon, int consecutive);
void RNA_def_property_update(PropertyRNA *prop, int noteflag, const char *updatefunc);