From 98ae3c949f8a7e63a5337e50bf39cce2c8add9bf Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 11 Jul 2010 10:59:03 +0000 Subject: [PATCH] cast the udn*() function args --- ChangeLog | 5 +++++ src/xspice/icm/xtraevt/int/udnfunc.c | 18 +++++++++--------- src/xspice/icm/xtraevt/real/udnfunc.c | 18 +++++++++--------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e2d98c09..05d865a58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-07-11 Robert Larice + * src/xspice/icm/xtraevt/int/udnfunc.c , + * src/xspice/icm/xtraevt/real/udnfunc.c : + cast the udn*() function args + 2010-07-10 Robert Larice * src/include/spmatrix.h , * src/maths/sparse/spbuild.c : diff --git a/src/xspice/icm/xtraevt/int/udnfunc.c b/src/xspice/icm/xtraevt/int/udnfunc.c index 6ecdcb7b8..f1367bf5a 100644 --- a/src/xspice/icm/xtraevt/int/udnfunc.c +++ b/src/xspice/icm/xtraevt/int/udnfunc.c @@ -69,7 +69,7 @@ void udn_int_dismantle(DISMANTLE_ARGS) void udn_int_initialize(INITIALIZE_ARGS) { - int *int_struct = STRUCT_PTR; + int *int_struct = (int *) STRUCT_PTR; /* Initialize to zero */ @@ -81,7 +81,7 @@ void udn_int_initialize(INITIALIZE_ARGS) void udn_int_invert(INVERT_ARGS) { - int *int_struct = STRUCT_PTR; + int *int_struct = (int *) STRUCT_PTR; /* Invert the state */ @@ -93,8 +93,8 @@ void udn_int_invert(INVERT_ARGS) void udn_int_copy(COPY_ARGS) { - int *int_from_struct = INPUT_STRUCT_PTR; - int *int_to_struct = OUTPUT_STRUCT_PTR; + int *int_from_struct = (int *) INPUT_STRUCT_PTR; + int *int_to_struct = (int *) OUTPUT_STRUCT_PTR; /* Copy the structure */ *int_to_struct = *int_from_struct; @@ -105,7 +105,7 @@ void udn_int_copy(COPY_ARGS) void udn_int_resolve(RESOLVE_ARGS) { int **array = (int**)INPUT_STRUCT_PTR_ARRAY; - int *out = OUTPUT_STRUCT_PTR; + int *out = (int *) OUTPUT_STRUCT_PTR; int num_struct = INPUT_STRUCT_PTR_ARRAY_SIZE; int sum; @@ -123,8 +123,8 @@ void udn_int_resolve(RESOLVE_ARGS) void udn_int_compare(COMPARE_ARGS) { - int *int_struct1 = STRUCT_PTR_1; - int *int_struct2 = STRUCT_PTR_2; + int *int_struct1 = (int *) STRUCT_PTR_1; + int *int_struct2 = (int *) STRUCT_PTR_2; /* Compare the structures */ if((*int_struct1) == (*int_struct2)) @@ -138,7 +138,7 @@ void udn_int_compare(COMPARE_ARGS) void udn_int_plot_val(PLOT_VAL_ARGS) { - int *int_struct = STRUCT_PTR; + int *int_struct = (int *) STRUCT_PTR; /* Output a value for the int struct */ PLOT_VAL = *int_struct; @@ -149,7 +149,7 @@ void udn_int_plot_val(PLOT_VAL_ARGS) void udn_int_print_val(PRINT_VAL_ARGS) { - int *int_struct = STRUCT_PTR; + int *int_struct = (int *) STRUCT_PTR; /* Allocate space for the printed value */ PRINT_VAL = (char *) tmalloc(30); diff --git a/src/xspice/icm/xtraevt/real/udnfunc.c b/src/xspice/icm/xtraevt/real/udnfunc.c index 722793096..b47d5fb8f 100644 --- a/src/xspice/icm/xtraevt/real/udnfunc.c +++ b/src/xspice/icm/xtraevt/real/udnfunc.c @@ -69,7 +69,7 @@ void udn_real_dismantle(DISMANTLE_ARGS) void udn_real_initialize(INITIALIZE_ARGS) { - double *real_struct = STRUCT_PTR; + double *real_struct = (double *) STRUCT_PTR; /* Initialize to zero */ @@ -81,7 +81,7 @@ void udn_real_initialize(INITIALIZE_ARGS) void udn_real_invert(INVERT_ARGS) { - double *real_struct = STRUCT_PTR; + double *real_struct = (double *) STRUCT_PTR; /* Invert the state */ @@ -94,7 +94,7 @@ void udn_real_invert(INVERT_ARGS) void udn_real_resolve(RESOLVE_ARGS) { double **array = (double**)INPUT_STRUCT_PTR_ARRAY; - double *out = OUTPUT_STRUCT_PTR; + double *out = (double *) OUTPUT_STRUCT_PTR; int num_struct = INPUT_STRUCT_PTR_ARRAY_SIZE; double sum; @@ -112,8 +112,8 @@ void udn_real_resolve(RESOLVE_ARGS) void udn_real_copy(COPY_ARGS) { - double *real_from_struct = INPUT_STRUCT_PTR; - double *real_to_struct = OUTPUT_STRUCT_PTR; + double *real_from_struct = (double *) INPUT_STRUCT_PTR; + double *real_to_struct = (double *) OUTPUT_STRUCT_PTR; /* Copy the structure */ *real_to_struct = *real_from_struct; @@ -124,8 +124,8 @@ void udn_real_copy(COPY_ARGS) void udn_real_compare(COMPARE_ARGS) { - double *real_struct1 = STRUCT_PTR_1; - double *real_struct2 = STRUCT_PTR_2; + double *real_struct1 = (double *) STRUCT_PTR_1; + double *real_struct2 = (double *) STRUCT_PTR_2; /* Compare the structures */ if((*real_struct1) == (*real_struct2)) @@ -139,7 +139,7 @@ void udn_real_compare(COMPARE_ARGS) void udn_real_plot_val(PLOT_VAL_ARGS) { - double *real_struct = STRUCT_PTR; + double *real_struct = (double *) STRUCT_PTR; /* Output a value for the real struct */ @@ -151,7 +151,7 @@ void udn_real_plot_val(PLOT_VAL_ARGS) void udn_real_print_val(PRINT_VAL_ARGS) { - double *real_struct = STRUCT_PTR; + double *real_struct = (double *) STRUCT_PTR; /* Allocate space for the printed value */