From fd7ef635a28edab3086c8dc339f8df423587a62c Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 11 Jul 2010 16:04:27 +0000 Subject: [PATCH] missing casts --- ChangeLog | 4 ++++ src/xspice/idn/idndig.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f77c6b9c..8397036c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-07-11 Robert Larice + * src/xspice/idn/idndig.c : + missing casts + 2010-07-11 Robert Larice * src/ngmultidec.c , * src/frontend/resource.c : diff --git a/src/xspice/idn/idndig.c b/src/xspice/idn/idndig.c index 0dd55ba97..19632bad8 100755 --- a/src/xspice/idn/idndig.c +++ b/src/xspice/idn/idndig.c @@ -67,7 +67,7 @@ void idn_digital_dismantle(void *evt_struct) void idn_digital_initialize(void *evt_struct) { - Digital_t *dig_struct = evt_struct; + Digital_t *dig_struct = (Digital_t *) evt_struct; /* Initialize to unknown state and strength */ @@ -80,7 +80,7 @@ void idn_digital_initialize(void *evt_struct) void idn_digital_invert(void *evt_struct) { - Digital_t *dig_struct = evt_struct; + Digital_t *dig_struct = (Digital_t *) evt_struct; /* Invert the state */ @@ -105,8 +105,8 @@ void idn_digital_invert(void *evt_struct) void idn_digital_copy(void *evt_from_struct, void *evt_to_struct) { - Digital_t *dig_from_struct = evt_from_struct; - Digital_t *dig_to_struct = evt_to_struct; + Digital_t *dig_from_struct = (Digital_t *) evt_from_struct; + Digital_t *dig_to_struct = (Digital_t *) evt_to_struct; /* Copy the structure */ dig_to_struct->state = dig_from_struct->state; @@ -142,7 +142,7 @@ void idn_digital_resolve(int num_struct, int index2; /* Cast the input void pointers to pointers of the digital type */ - dig_struct = evt_struct; + dig_struct = (Digital_t *) evt_struct; dig_struct_array = (Digital_t **)evt_struct_array; /* Copy the first member of the array directly to the output */ @@ -165,8 +165,8 @@ void idn_digital_resolve(int num_struct, } /* Convert result back to state and strength */ - dig_struct->state = index1 % 3; - dig_struct->strength = index1 / 3; + dig_struct->state = (Digital_State_t) (index1 % 3); + dig_struct->strength = (Digital_Strength_t) (index1 / 3); } @@ -175,8 +175,8 @@ void idn_digital_resolve(int num_struct, void idn_digital_compare(void *evt_struct1, void *evt_struct2, Boolean_t *equal) { - Digital_t *dig_struct1 = evt_struct1; - Digital_t *dig_struct2 = evt_struct2; + Digital_t *dig_struct1 = (Digital_t *) evt_struct1; + Digital_t *dig_struct2 = (Digital_t *) evt_struct2; /* Compare the structures in order of most likely differences */ if(dig_struct1->state != dig_struct2->state) @@ -192,7 +192,7 @@ void idn_digital_compare(void *evt_struct1, void *evt_struct2, void idn_digital_plot_val(void *evt_struct, char *member, double *val) { - Digital_t *dig_struct = evt_struct; + Digital_t *dig_struct = (Digital_t *) evt_struct; /* Output a value for the requested member of the digital struct */ @@ -244,7 +244,7 @@ void idn_digital_plot_val(void *evt_struct, char *member, double *val) void idn_digital_print_val(void *evt_struct, char *member, char **val) { - Digital_t *dig_struct = evt_struct; + Digital_t *dig_struct = (Digital_t *) evt_struct; int index;