From ca911d3b5f796b0045e00b956bca492450c94ed8 Mon Sep 17 00:00:00 2001
From: Mathieu L Bouchard <matju@artengine.ca>
Date: Thu, 7 Aug 2014 14:40:08 -0400
Subject: [PATCH] remove unused vars & fix %x formats
---
pd/extra/expr~/vexp.c | 14 ++------
pd/extra/expr~/vexp_fun.c | 72 +++++++++++++--------------------------
2 files changed, 27 insertions(+), 59 deletions(-)
diff --git a/pd/extra/expr~/vexp.c b/pd/extra/expr~/vexp.c
index 45380ff97..66a6d6dba 100644
--- a/pd/extra/expr~/vexp.c
+++ b/pd/extra/expr~/vexp.c
@@ -1108,7 +1108,7 @@ abort();
case ET_LB:
default:
post_error((fts_object_t *) expr,
- "expr: ex_eval: unexpected type %d\n", eptr->ex_type);
+ "expr: ex_eval: unexpected type %ld\n", eptr->ex_type);
return (exNULL);
}
if (!eptr[1].ex_type) {
@@ -1190,7 +1190,7 @@ abort();
case OP_COMMA:
case OP_SEMI:
default:
- post_error((fts_object_t *) expr, "expr: ex_print: bad op 0x%x\n", eptr->ex_op);
+ post_error((fts_object_t *) expr, "expr: ex_print: bad op 0x%lx\n", eptr->ex_op);
return (exNULL);
}
@@ -1258,12 +1258,6 @@ eval_store(struct expr *expr, struct ex_ex *eptr, struct ex_ex *optr, int idx)
/* the operation stack */
/* the result pointer */
{
- struct ex_ex arg;
- int isvalue;
- char *tbl = (char *) 0;
- char *var = (char *) 0;
- int badleft = 0;
-
post("store called\n");
ex_print(eptr);
eptr = ex_eval(expr, ++eptr, optr, idx);
@@ -1365,7 +1359,6 @@ eval_var(struct expr *expr, struct ex_ex *eptr, struct ex_ex *optr, int idx)
/* the operation stack */
/* the result pointer */
{
- struct ex_ex arg;
char *var = (char *) 0;
int novar = 0;
@@ -1411,10 +1404,9 @@ eval_sigidx(struct expr *expr, struct ex_ex *eptr, struct ex_ex *optr, int idx)
{
struct ex_ex arg;
struct ex_ex *reteptr;
- int i = 0, j = 0;
+ int i = 0;
t_float fi = 0, /* index in float */
rem_i = 0; /* remains of the float */
- char *tbl;
arg.ex_type = 0;
arg.ex_int = 0;
diff --git a/pd/extra/expr~/vexp_fun.c b/pd/extra/expr~/vexp_fun.c
index 47d95e1d9..ab54c33db 100644
--- a/pd/extra/expr~/vexp_fun.c
+++ b/pd/extra/expr~/vexp_fun.c
@@ -475,8 +475,7 @@ ex_func(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)\
{ \
struct ex_ex *left; \
t_float *op; /* output pointer */ \
- t_float *lp, *rp; /* left and right vector pointers */ \
- t_float scalar; \
+ t_float *lp; /* left vector pointer */ \
int j; \
\
left = argv++; \
@@ -532,8 +531,7 @@ ex_toint(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -562,8 +560,7 @@ ex_rint(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -580,8 +577,7 @@ ex_tofloat(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -616,8 +612,7 @@ ex_sqrt(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -633,8 +628,7 @@ ex_exp(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -650,8 +644,7 @@ ex_log(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -667,8 +660,7 @@ ex_ln(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -681,8 +673,7 @@ ex_sin(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -695,8 +686,7 @@ ex_cos(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -710,8 +700,7 @@ ex_tan(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -724,8 +713,7 @@ ex_asin(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -738,8 +726,7 @@ ex_acos(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -753,8 +740,7 @@ ex_atan(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -805,8 +791,7 @@ ex_floor(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -822,8 +807,7 @@ ex_ceil(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -835,8 +819,7 @@ ex_sinh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -849,8 +832,7 @@ ex_cosh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -864,8 +846,7 @@ ex_tanh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -880,8 +861,7 @@ ex_asinh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -894,8 +874,7 @@ ex_acosh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -908,8 +887,7 @@ ex_atanh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -940,8 +918,7 @@ ex_fact(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
@@ -977,8 +954,7 @@ ex_abs(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
t_float *op; /* output pointer */
- t_float *lp, *rp; /* left and right vector pointers */
- t_float scalar;
+ t_float *lp;
int j;
left = argv++;
--
GitLab