diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/bubble3d.c | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/bubble3d.c')
-rw-r--r-- | hacks/glx/bubble3d.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/hacks/glx/bubble3d.c b/hacks/glx/bubble3d.c index 9cd2afc..7b0b686 100644 --- a/hacks/glx/bubble3d.c +++ b/hacks/glx/bubble3d.c @@ -114,20 +114,20 @@ glb_bubble_new(glb_data *d, GLfloat x, GLfloat y, GLfloat z, GLfloat scale, b->contributions = (GLfloat *) malloc(sizeof (GLfloat) * nr_vertices * glb_config.nr_nudge_axes); if (b->contributions == 0) { - (void) free((void *) b); + free(b); return 0; } b->nudge_angle = (GLfloat *) malloc(sizeof (GLfloat) * glb_config.nr_nudge_axes); if (b->nudge_angle == 0) { - (void) free((void *) b->contributions); - (void) free((void *) b); + free(b->contributions); + free(b); return 0; } b->nudge_angle_incr = (GLfloat *) malloc(sizeof (GLfloat) * glb_config.nr_nudge_axes); if (b->nudge_angle_incr == 0) { - (void) free((void *) b->nudge_angle); - (void) free((void *) b->contributions); - (void) free((void *) b); + free(b->nudge_angle); + free(b->contributions); + free(b); return 0; } /* Initialize primitive elements. */ @@ -176,18 +176,18 @@ glb_bubble_delete(void *bb) if (b != NULL) { if (b->nudge_angle_incr) { - (void) free((void *) b->nudge_angle_incr); + free(b->nudge_angle_incr); b->nudge_angle_incr = NULL; } if (b->nudge_angle) { - (void) free((void *) b->nudge_angle); + free(b->nudge_angle); b->nudge_angle = NULL; } if (b->contributions) { - (void) free((void *) b->contributions); + free(b->contributions); b->contributions = NULL; } - (void) free((void *) b); + free(b); b = NULL; } } @@ -267,7 +267,7 @@ glb_bubble_draw(glb_data *d, void *bb) } glEnd(); glPopMatrix(); - (void) free((void *) new_vertices); + free(new_vertices); glb_config.polygon_count += nr_triangles; } |