diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-26 18:03:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-26 18:59:24 +0300 |
| commit | fca515838e70f8bec7028b840bb921a1be9fabbb (patch) | |
| tree | 1752923de19eca5f01ca4cfb5754fd4d1f13d934 /source/blender/nodes | |
| parent | d44890ee75634052f325531766a661a5bcef628f (diff) | |
Cleanup: strcmp/strncmp -> STREQ/STREQLEN (in boolean usage).
Makes usage of those funcs much more clear, we even had mixed '!strcmp(foo, bar)'
and 'strcmp(foo, bar) == 0' in several places...
Diffstat (limited to 'source/blender/nodes')
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index ecc02e732ce..e8845b543b8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -439,7 +439,7 @@ static void node_composit_init_rlayers(const bContext *C, PointerRNA *ptr) static int node_composit_poll_rlayers(bNodeType *UNUSED(ntype), bNodeTree *ntree) { - if (strcmp(ntree->idname, "CompositorNodeTree") == 0) { + if (STREQ(ntree->idname, "CompositorNodeTree")) { Scene *scene; /* XXX ugly: check if ntree is a local scene node tree. diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index 282567b797f..01c642b063d 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -108,7 +108,7 @@ static bNodeSocket *verify_socket_template(bNodeTree *ntree, bNode *node, int in bNodeSocket *sock; for (sock = socklist->first; sock; sock = sock->next) { - if (strncmp(sock->name, stemp->name, NODE_MAXSTR) == 0) + if (STREQLEN(sock->name, stemp->name, NODE_MAXSTR)) break; } if (sock) { diff --git a/source/blender/nodes/shader/nodes/node_shader_geom.c b/source/blender/nodes/shader/nodes/node_shader_geom.c index 7c598f92bed..2fb03536bbe 100644 --- a/source/blender/nodes/shader/nodes/node_shader_geom.c +++ b/source/blender/nodes/shader/nodes/node_shader_geom.c @@ -63,7 +63,7 @@ static void node_shader_exec_geom(void *data, int UNUSED(thread), bNode *node, b if (ngeo->uvname[0]) { /* find uv map by name */ for (i = 0; i < shi->totuv; i++) { - if (strcmp(shi->uv[i].name, ngeo->uvname) == 0) { + if (STREQ(shi->uv[i].name, ngeo->uvname)) { suv = &shi->uv[i]; break; } @@ -84,7 +84,7 @@ static void node_shader_exec_geom(void *data, int UNUSED(thread), bNode *node, b if (ngeo->colname[0]) { for (i = 0; i < shi->totcol; i++) { - if (strcmp(shi->col[i].name, ngeo->colname) == 0) { + if (STREQ(shi->col[i].name, ngeo->colname)) { scol = &shi->col[i]; break; } diff --git a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c index fd864f1c7c6..9fe56d4f01d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c +++ b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c @@ -51,7 +51,7 @@ static void node_shader_init_subsurface_scattering(bNodeTree *UNUSED(ntree), bNo node->custom1 = SHD_SUBSURFACE_CUBIC; /*for (sock = node->inputs.first; sock; sock = sock->next) { - if (strcmp(sock->name, "Sharpness") == 0) { + if (STREQ(sock->name, "Sharpness")) { bNodeSocketValueFloat *dval = sock->default_value; dval->value = 0.0f; } @@ -72,7 +72,7 @@ static void node_shader_update_subsurface_scattering(bNodeTree *UNUSED(ntree), b int falloff = node->custom1; for (sock = node->inputs.first; sock; sock = sock->next) { - if (strcmp(sock->name, "Sharpness") == 0) { + if (STREQ(sock->name, "Sharpness")) { if (falloff == SHD_SUBSURFACE_CUBIC) sock->flag &= ~SOCK_UNAVAIL; else |