From f79e6f12523d2256ef5d60a2fa33a4a87a001055 Mon Sep 17 00:00:00 2001 From: Fabrice Bellet Date: Fri, 20 Jul 2012 16:35:36 +0200 Subject: [PATCH 2/3] use snprintf for rotor strings --- src/FDM/YASim/Rotor.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/FDM/YASim/Rotor.cpp b/src/FDM/YASim/Rotor.cpp index 79e5fd1..1e93ecc 100644 --- a/src/FDM/YASim/Rotor.cpp +++ b/src/FDM/YASim/Rotor.cpp @@ -274,7 +274,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f) if (4>numRotorparts()) return 0; //compile first! if (j==0) { - sprintf(text,"/rotors/%s/cone-deg", _name); + snprintf(text, 256, "/rotors/%s/cone-deg", _name); *f=(_balance1>-1)?( ((Rotorpart*)getRotorpart(0))->getrealAlpha() +((Rotorpart*)getRotorpart(1*(_number_of_parts>>2)))->getrealAlpha() +((Rotorpart*)getRotorpart(2*(_number_of_parts>>2)))->getrealAlpha() @@ -284,7 +284,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f) else if (j==1) { - sprintf(text,"/rotors/%s/roll-deg", _name); + snprintf(text, 256, "/rotors/%s/roll-deg", _name); _roll = ( ((Rotorpart*)getRotorpart(0))->getrealAlpha() -((Rotorpart*)getRotorpart(2*(_number_of_parts>>2)))->getrealAlpha() )/2*(_ccw?-1:1); @@ -293,7 +293,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f) else if (j==2) { - sprintf(text,"/rotors/%s/yaw-deg", _name); + snprintf(text, 256, "/rotors/%s/yaw-deg", _name); _yaw=( ((Rotorpart*)getRotorpart(1*(_number_of_parts>>2)))->getrealAlpha() -((Rotorpart*)getRotorpart(3*(_number_of_parts>>2)))->getrealAlpha() )/2; @@ -302,38 +302,38 @@ int Rotor::getValueforFGSet(int j,char *text,float *f) else if (j==3) { - sprintf(text,"/rotors/%s/rpm", _name); + snprintf(text, 256, "/rotors/%s/rpm", _name); *f=(_balance1>-1)?_omega/2/pi*60:0; } else if (j==4) { - sprintf(text,"/rotors/%s/tilt/pitch-deg",_name); + snprintf(text, 256, "/rotors/%s/tilt/pitch-deg",_name); *f=_tilt_pitch*180/pi; } else if (j==5) { - sprintf(text,"/rotors/%s/tilt/roll-deg",_name); + snprintf(text, 256, "/rotors/%s/tilt/roll-deg",_name); *f=_tilt_roll*180/pi; } else if (j==6) { - sprintf(text,"/rotors/%s/tilt/yaw-deg",_name); + snprintf(text, 256, "/rotors/%s/tilt/yaw-deg",_name); *f=_tilt_yaw*180/pi; } else if (j==7) { - sprintf(text,"/rotors/%s/balance", _name); + snprintf(text, 256, "/rotors/%s/balance", _name); *f=_balance1; } else if (j==8) { - sprintf(text,"/rotors/%s/stall",_name); + snprintf(text, 256, "/rotors/%s/stall",_name); *f=getOverallStall(); } else if (j==9) { - sprintf(text,"/rotors/%s/torque",_name); + snprintf(text, 256, "/rotors/%s/torque",_name); *f=-_torque;; } else @@ -344,7 +344,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f) return 0; } int w=j%3; - sprintf(text,"/rotors/%s/blade[%i]/%s", + snprintf(text, 256, "/rotors/%s/blade[%i]/%s", _name,b, w==0?"position-deg":(w==1?"flap-deg":"incidence-deg")); *f=((Rotorpart*)getRotorpart(0))->getPhi()*180/pi -- 1.7.10.4