summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2019-06-11 22:48:11 +0200
committerThomas White <taw@physics.org>2019-06-11 23:21:03 +0200
commitddf8db00513292b9a32a133e9652c90aa4a16e46 (patch)
tree0d482b6f8fd6464b2387e67bb47843f2e5fab769
parentb6e5f569f3d29dddc595c71bb00eba35983b0d03 (diff)
Remove duplicate code
-rw-r--r--src/nanolight.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nanolight.c b/src/nanolight.c
index a9b3eab..52f338e 100644
--- a/src/nanolight.c
+++ b/src/nanolight.c
@@ -198,15 +198,14 @@ static struct fixture *create_fixture(struct nanolight *nl, struct fixture_class
fix->base_addr = base_addr;
fix->cls = cls;
fix->attr_vals = calloc(cls->n_attrs, sizeof(int));
- if ( fix->attr_vals == NULL ) {
- nl->n_fixtures--;
- return NULL;
- }
fix->attr_vals_start = calloc(cls->n_attrs, sizeof(int));
- if ( fix->attr_vals_start == NULL ) {
+ if ( (fix->attr_vals == NULL)
+ || (fix->attr_vals_start == NULL) )
+ {
nl->n_fixtures--;
return NULL;
}
+
return fix;
}