diff options
Diffstat (limited to 'device-functions.c')
| -rw-r--r-- | device-functions.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/device-functions.c b/device-functions.c index ddeb5bb..40f5f65 100644 --- a/device-functions.c +++ b/device-functions.c @@ -2421,8 +2421,8 @@ int Set_VI_Cal_Pnt(int parameter,int channel,int calibration_point_number,float int Set_VI_Del_Cal(int parameter,int channel,int calibration_point_number) { int polarity,range,entry,status,i,num_in_range,num_of_ranges; - float temp1[10]; - short temp2[10]; + float temp_float1[10]; + short temp_short1[10]; int index; int max_points,max_polarity,max_ranges; short *pointer_short1; @@ -2515,8 +2515,8 @@ int Set_VI_Del_Cal(int parameter,int channel,int calibration_point_number) /* backup calibration values */ for (i=0; i<max_points; i++) { - temp1[i]=pointer_float1[index+i]; - temp2[i]=pointer_short1[index+i]; + temp_float1[i]=pointer_float1[index+i]; + temp_short1[i]=pointer_short1[index+i]; } /* move the data, overwriting the deleted point */ @@ -2534,8 +2534,8 @@ int Set_VI_Del_Cal(int parameter,int channel,int calibration_point_number) if (status) { /* revert to original calibration */ for (i=0; i<max_points; i++) { - *(float *)(&pointer_float1[index+i])=temp1[i]; - *(short *)(&pointer_short1[index+i])=temp2[i]; + *(float *)(&pointer_float1[index+i])=temp_float1[i]; + *(short *)(&pointer_short1[index+i])=temp_short1[i]; } } |