diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-01-21 05:28:50 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-01-21 05:28:50 +0000 |
| commit | e41ecc8d7f0e2433d45af37e9621752f3f92f024 (patch) | |
| tree | 53556dc87a9de5d3fde837e4e2cea0c2df3d11b0 | |
| parent | b7bfe2596bff3d80a1132777c1af67d3e72a1215 (diff) | |
dahdi: Fix 'void *' pointer arithmetic warnings.
(closes issue #15927)
Reported by: Max Khon
Patches:
dahdi_echocan2.diff uploaded by Max Khon (license 884)
void2.diff uploaded by Max Khon (license 884)
Signed-off-by: Kinsey Moore <kmoore@digium.com>
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9420
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9664 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 4 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi_echocan_kb1.c | 6 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi_echocan_mg2.c | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 5e1137d..be4c089 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -3093,7 +3093,7 @@ static int ioctl_load_zone(unsigned long data) return -ENOMEM; } - ptr += sizeof(*z); + ptr = (char *) ptr + sizeof(*z); space -= sizeof(*z); dahdi_copy_string(z->name, work->th.name, sizeof(z->name)); @@ -3135,7 +3135,7 @@ static int ioctl_load_zone(unsigned long data) t = work->samples[x] = ptr; space -= sizeof(*t); - ptr += sizeof(*t); + ptr = (char *) ptr + sizeof(*t); /* Remember which sample is work->next */ work->next[x] = work->td.next; diff --git a/drivers/dahdi/dahdi_echocan_kb1.c b/drivers/dahdi/dahdi_echocan_kb1.c index 94f8523..7433d3e 100644 --- a/drivers/dahdi/dahdi_echocan_kb1.c +++ b/drivers/dahdi/dahdi_echocan_kb1.c @@ -266,7 +266,7 @@ static inline short get_cc_s(echo_can_cb_s *cb, int pos) static inline void init_cc(struct ec_pvt *pvt, int N, int maxy, int maxu) { - void *ptr = pvt; + char *ptr = (char *) pvt; unsigned long tmp; /* Double-word align past end of state */ @@ -281,9 +281,9 @@ static inline void init_cc(struct ec_pvt *pvt, int N, int maxy, int maxu) pvt->beta2_i = DEFAULT_BETA1_I; /* Allocate coefficient memory */ - pvt->a_i = ptr; + pvt->a_i = (int *) ptr; ptr += (sizeof(int) * pvt->N_d); - pvt->a_s = ptr; + pvt->a_s = (short *) ptr; ptr += (sizeof(short) * pvt->N_d); /* Reset Y circular buffer (short version) */ diff --git a/drivers/dahdi/dahdi_echocan_mg2.c b/drivers/dahdi/dahdi_echocan_mg2.c index 5dfd882..b2a102d 100644 --- a/drivers/dahdi/dahdi_echocan_mg2.c +++ b/drivers/dahdi/dahdi_echocan_mg2.c @@ -307,7 +307,7 @@ static inline short get_cc_s(echo_can_cb_s *cb, int pos) static inline void init_cc(struct ec_pvt *pvt, int N, int maxy, int maxu) { - void *ptr = pvt; + char *ptr = (char *) pvt; unsigned long tmp; /* Double-word align past end of state */ @@ -322,15 +322,15 @@ static inline void init_cc(struct ec_pvt *pvt, int N, int maxy, int maxu) pvt->beta2_i = DEFAULT_BETA1_I; /* Allocate coefficient memory */ - pvt->a_i = ptr; + pvt->a_i = (int *) ptr; ptr += (sizeof(int) * pvt->N_d); - pvt->a_s = ptr; + pvt->a_s = (short *) ptr; ptr += (sizeof(short) * pvt->N_d); /* Allocate backup memory */ - pvt->b_i = ptr; + pvt->b_i = (int *) ptr; ptr += (sizeof(int) * pvt->N_d); - pvt->c_i = ptr; + pvt->c_i = (int *) ptr; ptr += (sizeof(int) * pvt->N_d); /* Reset Y circular buffer (short version) */ @@ -387,7 +387,7 @@ static void echo_can_free(struct dahdi_chan *chan, struct dahdi_echocan_state *e } #ifdef DC_NORMALIZE -short inline dc_removal(int *dc_estimate, short samp) +static inline short dc_removal(int *dc_estimate, short samp) { *dc_estimate += ((((int)samp << 15) - *dc_estimate) >> 9); return samp - (*dc_estimate >> 15); |