Fixes from Cameron Moore:

I've attached 3 diffs against files in FlightGear to fix some printf
format strings.  The changes are pretty straight forward.  Let me know
if you have any questions.  (BTW, I'm using gcc 2.95.4)

diff --git a/src/FDM/JSBSim/FGfdmSocket.cpp b/src/FDM/JSBSim/FGfdmSocket.cpp
index 01f14a93082888a163cbf76ab6bac83dbbcea32e..a20a79ad7f539a36788e310350eca9ef50bf6b16 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.cpp
+++ b/src/FDM/JSBSim/FGfdmSocket.cpp
@@ -140,7 +140,7 @@ void FGfdmSocket::Append(long item)
 {
   char s[25];
 
-  sprintf(s,"%12d",item);
+  sprintf(s,"%12ld",item);
 
   if (size == 0) buffer += string(s);
   else buffer += string(",") + string(s);

diff --git a/src/FDM/LaRCsim/ls_interface.c b/src/FDM/LaRCsim/ls_interface.c
index fa38bc83d52ee92f9860cbb78ee5d9eb75d31f1f..ac2469c0e5e5bf93e7dfe5db3586ed161c2f95d7 100644 (file)
--- a/src/FDM/LaRCsim/ls_interface.c
+++ b/src/FDM/LaRCsim/ls_interface.c
@@ -295,7 +295,7 @@ void ls_stamp( void ) {
     date = (nowtime->tm_year)*10000 
         + (nowtime->tm_mon + 1)*100
         + (nowtime->tm_mday);
-    sprintf(sim_control_.date_string, "%06d\0", date);
+    sprintf(sim_control_.date_string, "%06ld\0", date);
     sprintf(sim_control_.time_stamp, "%02d:%02d:%02d\0", 
        nowtime->tm_hour, nowtime->tm_min, nowtime->tm_sec);
 #ifdef COMPILE_THIS_CODE_THIS_USELESS_CODE
@@ -580,6 +580,13 @@ int ls_ForceAltitude(double alt_feet) {
 /* Flight Gear Modification Log
  *
  * $Log$
+ * Revision 1.6  2002/01/30 15:17:27  david
+ * Fixes from Cameron Moore:
+ *
+ * I've attached 3 diffs against files in FlightGear to fix some printf
+ * format strings.  The changes are pretty straight forward.  Let me know
+ * if you have any questions.  (BTW, I'm using gcc 2.95.4)
+ *
  * Revision 1.5  2001/05/21 18:44:59  curt
  * Tile pager tweaks.
  * MSVC++ tweaks.

diff --git a/src/GUI/prop_picker.cxx b/src/GUI/prop_picker.cxx
index a5137946018d3cc544bca7c73085978af151a345..cdbf6b64ecaf793b77bb903b231be36ff5e09b19 100755 (executable)
--- a/src/GUI/prop_picker.cxx
+++ b/src/GUI/prop_picker.cxx
@@ -504,7 +504,7 @@ void fgPropPicker::find_props ()
 
   files [ num_files ] = NULL ;
 
-  printf("files pointer=%i\n", files);
+  printf("files pointer=%p\n", files);
   proppath ->    setLabel          (startDir);
   list_box -> newList ( files ) ;