Commit b04a448b authored by Cedric Roux's avatar Cedric Roux

bugfix: calloc arguments' wrong order

parent 497c64a9
...@@ -258,8 +258,8 @@ void xy_plot_set_points(gui *_gui, widget *_this, int plot, ...@@ -258,8 +258,8 @@ void xy_plot_set_points(gui *_gui, widget *_this, int plot,
if (npoints != this->plots[plot].npoints) { if (npoints != this->plots[plot].npoints) {
free(this->plots[plot].x); free(this->plots[plot].x);
free(this->plots[plot].y); free(this->plots[plot].y);
this->plots[plot].x = calloc(sizeof(float), npoints); this->plots[plot].x = calloc(npoints, sizeof(float));
this->plots[plot].y = calloc(sizeof(float), npoints); this->plots[plot].y = calloc(npoints, sizeof(float));
this->plots[plot].npoints = npoints; this->plots[plot].npoints = npoints;
} }
......
...@@ -39,9 +39,9 @@ static void _event(void *p, event e) ...@@ -39,9 +39,9 @@ static void _event(void *p, event e)
l->blength = nsamples * 10; l->blength = nsamples * 10;
free(l->x); free(l->x);
free(l->buffer); free(l->buffer);
l->x = calloc(sizeof(float), l->blength); l->x = calloc(l->blength, sizeof(float));
if (l->x == NULL) abort(); if (l->x == NULL) abort();
l->buffer = calloc(sizeof(float), l->blength); l->buffer = calloc(l->blength, sizeof(float));
if (l->buffer == NULL) abort(); if (l->buffer == NULL) abort();
/* update 'x' */ /* update 'x' */
for (i = 0; i < l->blength; i++) for (i = 0; i < l->blength; i++)
......
...@@ -74,8 +74,8 @@ static void set(view *_this, char *name, ...) ...@@ -74,8 +74,8 @@ static void set(view *_this, char *name, ...)
free(this->x); free(this->x);
free(this->y); free(this->y);
this->length = va_arg(ap, int); this->length = va_arg(ap, int);
this->x = calloc(sizeof(float), this->length); if (this->x==NULL)abort(); this->x = calloc(this->length, sizeof(float)); if (this->x==NULL)abort();
this->y = calloc(sizeof(float), this->length); if (this->y==NULL)abort(); this->y = calloc(this->length, sizeof(float)); if (this->y==NULL)abort();
this->insert_point = 0; this->insert_point = 0;
va_end(ap); va_end(ap);
...@@ -104,8 +104,8 @@ view *new_view_xy(int length, float refresh_rate, gui *g, widget *w, ...@@ -104,8 +104,8 @@ view *new_view_xy(int length, float refresh_rate, gui *g, widget *w,
ret->plot = xy_plot_new_plot(g, w, color); ret->plot = xy_plot_new_plot(g, w, color);
ret->length = length; ret->length = length;
ret->x = calloc(sizeof(float), length); if (ret->x == NULL) abort(); ret->x = calloc(length, sizeof(float)); if (ret->x == NULL) abort();
ret->y = calloc(sizeof(float), length); if (ret->y == NULL) abort(); ret->y = calloc(length, sizeof(float)); if (ret->y == NULL) abort();
ret->insert_point = 0; ret->insert_point = 0;
if (pthread_mutex_init(&ret->lock, NULL)) abort(); if (pthread_mutex_init(&ret->lock, NULL)) abort();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment