From e8f23c32c8b6fc988129fe110a5160577854af77 Mon Sep 17 00:00:00 2001 From: Sojourner Truth <jon.w.wilkes@gmail.com> Date: Sat, 23 Jul 2016 21:57:56 -0400 Subject: [PATCH] fix some nasty regressions with drawnumber and drawsymbol due to Ivica and I overlooking fairly obvious compiler warnings :( --- pd/src/g_template.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pd/src/g_template.c b/pd/src/g_template.c index ec1aad229..5e8c8d397 100644 --- a/pd/src/g_template.c +++ b/pd/src/g_template.c @@ -6376,7 +6376,7 @@ static int drawnumber_gettype(t_drawnumber *x, t_word *data, { int type; t_symbol *arraytype; - if (template_find_field(template, /*x->x_fieldname*/ &x->x_value.fd_un.fd_varsym, onsetp, &type, + if (template_find_field(template, /*x->x_fieldname*/ x->x_value.fd_un.fd_varsym, onsetp, &type, &arraytype) && type != DT_ARRAY) return (type); else return (-1); @@ -6860,12 +6860,12 @@ static void drawsymbol_sprintf(t_drawsymbol *x, char *buf, t_atom *ap) //fprintf(stderr,"drawsymbol_sprintf %s\n", buf); }*/ -static int drawsymbol_gettype(t_drawnumber *x, t_word *data, +static int drawsymbol_gettype(t_drawsymbol *x, t_word *data, t_template *template, int *onsetp) { int type; t_symbol *arraytype; - if (template_find_field(template, /*x->x_fieldname*/ &x->x_value.fd_un.fd_varsym, onsetp, &type, + if (template_find_field(template, /*x->x_fieldname*/ x->x_value.fd_un.fd_varsym, onsetp, &type, &arraytype) && type != DT_ARRAY) return (type); else return (-1); @@ -6875,7 +6875,7 @@ static int drawsymbol_gettype(t_drawnumber *x, t_word *data, static void drawsymbol_getbuf(t_drawsymbol *x, t_word *data, t_template *template, char *buf) { - int nchars, onset, type = drawnumber_gettype(x, data, template, &onset); + int nchars, onset, type = drawsymbol_gettype(x, data, template, &onset); if (type < 0) buf[0] = 0; else -- GitLab