diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-06 04:49:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-06 04:49:21 +0300 |
commit | 1af83aa2dd895ca0e6e7a31d64c19ef4d3241298 (patch) | |
tree | a413c7950cfe83364f6c60fefa75610c4a7e6871 /source/blender/blenkernel | |
parent | 088636bc380a5f5f61f244e22e197d043de9de1a (diff) |
Cleanup: use 'r_' prefix for return arguments
Also avoid a redundant strlen call.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 703c45f5c77..45de2388ba8 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -211,8 +211,8 @@ const char *BKE_scene_multiview_view_suffix_get(const struct RenderData *rd, con const char *BKE_scene_multiview_view_id_suffix_get(const struct RenderData *rd, const int view_id); void BKE_scene_multiview_view_prefix_get(struct Scene *scene, const char *name, - char *rprefix, - const char **rext); + char *r_prefix, + const char **r_ext); void BKE_scene_multiview_videos_dimensions_get(const struct RenderData *rd, const size_t width, const size_t height, diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 272ce404c35..740db64e887 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1970,19 +1970,19 @@ const char *BKE_scene_multiview_view_id_suffix_get(const RenderData *rd, const i void BKE_scene_multiview_view_prefix_get(Scene *scene, const char *name, - char *rprefix, - const char **rext) + char *r_prefix, + const char **r_ext) { SceneRenderView *srv; size_t index_act; const char *suf_act; const char delims[] = {'.', '\0'}; - rprefix[0] = '\0'; + r_prefix[0] = '\0'; /* begin of extension */ - index_act = BLI_str_rpartition(name, delims, rext, &suf_act); - if (*rext == NULL) { + index_act = BLI_str_rpartition(name, delims, r_ext, &suf_act); + if (*r_ext == NULL) { return; } BLI_assert(index_act > 0); @@ -1990,9 +1990,10 @@ void BKE_scene_multiview_view_prefix_get(Scene *scene, for (srv = scene->r.views.first; srv; srv = srv->next) { if (BKE_scene_multiview_is_render_view_active(&scene->r, srv)) { - size_t len = strlen(srv->suffix); - if (strlen(*rext) >= len && STREQLEN(*rext - len, srv->suffix, len)) { - BLI_strncpy(rprefix, name, strlen(name) - strlen(*rext) - len + 1); + const size_t len = strlen(srv->suffix); + const size_t ext_len = strlen(*r_ext); + if (ext_len >= len && STREQLEN(*r_ext - len, srv->suffix, len)) { + BLI_strncpy(r_prefix, name, strlen(name) - ext_len - len + 1); break; } } |