[Opende-svn] SF.net SVN: opende:[1905] trunk

[<ole...@us...>]

Revision: 1905
          http://opende.svn.sourceforge.net/opende/?rev=1905&view=rev
Author:   oleh_derevenko
Date:     2012-11-04 20:24:26 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Cosmetic: Implemented patch #180 by DonLorenzo

Modified Paths:
--------------
    trunk/contrib/Mac_CFMCarbon/mac_source/drawstuff/src/mac_glut_carbon.cpp
    trunk/drawstuff/src/osx.cpp
    trunk/drawstuff/src/windows.cpp
    trunk/drawstuff/src/x11.cpp
    trunk/ode/demo/demo_ode.cpp
    trunk/ode/src/error.cpp

Modified: trunk/contrib/Mac_CFMCarbon/mac_source/drawstuff/src/mac_glut_carbon.cpp
===================================================================
--- trunk/contrib/Mac_CFMCarbon/mac_source/drawstuff/src/mac_glut_carbon.cpp	2012-08-19 17:37:50 UTC (rev 1904)
+++ trunk/contrib/Mac_CFMCarbon/mac_source/drawstuff/src/mac_glut_carbon.cpp	2012-11-04 20:24:26 UTC (rev 1905)
@@ -56,6 +56,7 @@
   va_list ap;
   va_start (ap,msg);
   printMessage ("Error",msg,ap);
+  va_end (ap);
   exit (1);
 }
 
@@ -65,6 +66,7 @@
   va_list ap;
   va_start (ap,msg);
   printMessage ("INTERNAL ERROR",msg,ap);
+  va_end (ap);
   // *((char *)0) = 0;	 ... commit SEGVicide ?
   abort();
 }
@@ -74,6 +76,7 @@
   va_list ap;
   va_start (ap,msg);
   vprintf (msg,ap);
+  va_end (ap);
 }
 
 //***************************************************************************

Modified: trunk/drawstuff/src/osx.cpp
===================================================================
--- trunk/drawstuff/src/osx.cpp	2012-08-19 17:37:50 UTC (rev 1904)
+++ trunk/drawstuff/src/osx.cpp	2012-11-04 20:24:26 UTC (rev 1905)
@@ -79,6 +79,7 @@
   va_list ap;
   va_start (ap,msg);
   printMessage ("Error",msg,ap);
+  va_end (ap);
   exit (1);
 }
 
@@ -88,6 +89,7 @@
   va_list ap;
   va_start (ap,msg);
   printMessage ("INTERNAL ERROR",msg,ap);
+  va_end (ap);
   // *((char *)0) = 0;	 ... commit SEGVicide ?
   abort();
 }
@@ -97,6 +99,7 @@
   va_list ap;
   va_start (ap,msg);
   vprintf (msg,ap);
+  va_end (ap);
 }
 
 static void captureFrame( int num ){

Modified: trunk/drawstuff/src/windows.cpp
===================================================================
--- trunk/drawstuff/src/windows.cpp	2012-08-19 17:37:50 UTC (rev 1904)
+++ trunk/drawstuff/src/windows.cpp	2012-11-04 20:24:26 UTC (rev 1905)
@@ -55,6 +55,7 @@
   va_list ap;
   va_start (ap,msg);
   errorBox ("Warning",msg,ap);
+  va_end (ap);
 }
 
 
@@ -63,6 +64,7 @@
   va_list ap;
   va_start (ap,msg);
   errorBox ("Error",msg,ap);
+  va_end (ap);
   exit (1);
 }
 
@@ -72,6 +74,7 @@
   va_list ap;
   va_start (ap,msg);
   errorBox ("INTERNAL ERROR",msg,ap);
+  va_end (ap);
   // *((char *)0) = 0;	 ... commit SEGVicide ?
   abort();
   exit (1);	  // should never get here, but just in case...
@@ -83,6 +86,7 @@
   va_list ap;
   va_start (ap,msg);
   vprintf (msg,ap);
+  va_end (ap);
 }
 
 //***************************************************************************

Modified: trunk/drawstuff/src/x11.cpp
===================================================================
--- trunk/drawstuff/src/x11.cpp	2012-08-19 17:37:50 UTC (rev 1904)
+++ trunk/drawstuff/src/x11.cpp	2012-11-04 20:24:26 UTC (rev 1905)
@@ -62,6 +62,7 @@
   va_list ap;
   va_start (ap,msg);
   printMessage ("Error",msg,ap);
+  va_end (ap);
   exit (1);
 }
 
@@ -71,6 +72,7 @@
   va_list ap;
   va_start (ap,msg);
   printMessage ("INTERNAL ERROR",msg,ap);
+  va_end (ap);
   // *((char *)0) = 0;	 ... commit SEGVicide ?
   abort();
 }
@@ -81,6 +83,7 @@
   va_list ap;
   va_start (ap,msg);
   vprintf (msg,ap);
+  va_end (ap);
 }
 
 //***************************************************************************

Modified: trunk/ode/demo/demo_ode.cpp
===================================================================
--- trunk/ode/demo/demo_ode.cpp	2012-08-19 17:37:50 UTC (rev 1904)
+++ trunk/ode/demo/demo_ode.cpp	2012-11-04 20:24:26 UTC (rev 1905)
@@ -951,6 +951,7 @@
     va_list ap;
     va_start (ap,name);
     vsprintf (mi->name,name,ap);
+    va_end (ap);
     if (strlen(mi->name) >= sizeof (mi->name)) dDebug (0,"name too long");
 
     mat.push_back(mi);
@@ -967,6 +968,7 @@
     va_list ap;
     va_start (ap,name);
     vsprintf (mi.name,name,ap);
+    va_end (ap);
     if (strlen(mi.name) >= sizeof (mi.name)) dDebug (0,"name too long");
 
     if (strcmp(mp->name,mi.name) != 0)

Modified: trunk/ode/src/error.cpp
===================================================================
--- trunk/ode/src/error.cpp	2012-08-19 17:37:50 UTC (rev 1904)
+++ trunk/ode/src/error.cpp	2012-11-04 20:24:26 UTC (rev 1905)
@@ -89,6 +89,7 @@
     va_start (ap,msg);
     if (error_function) error_function (num,msg,ap);
     else printMessage (num,"ODE Error",msg,ap);
+    va_end (ap);
     exit (1);
 }
 
@@ -99,6 +100,7 @@
     va_start (ap,msg);
     if (debug_function) debug_function (num,msg,ap);
     else printMessage (num,"ODE INTERNAL ERROR",msg,ap);
+    va_end (ap);
     // *((char *)0) = 0;   ... commit SEGVicide
     abort();
 }
@@ -110,6 +112,7 @@
     va_start (ap,msg);
     if (message_function) message_function (num,msg,ap);
     else printMessage (num,"ODE Message",msg,ap);
+    va_end (ap);
 }
 
 #endif
@@ -141,6 +144,7 @@
         s[sizeof(s)-1] = 0;
         MessageBox(0,s,title,MB_OK | MB_ICONWARNING);
     }
+    va_end (ap);
     exit (1);
 }
 
@@ -157,6 +161,7 @@
         s[sizeof(s)-1] = 0;
         MessageBox(0,s,title,MB_OK | MB_ICONSTOP);
     }
+    va_end (ap);
     abort();
 }
 
@@ -167,6 +172,7 @@
     va_start (ap,msg);
     if (message_function) message_function (num,msg,ap);
     else printMessage (num,"ODE Message",msg,ap);
+    va_end (ap);
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.