Commit: 2e5e8d50c4490b32b666efc42a7ea07b6e890f82 - mingw-get (git)

The MinGW.OSDN Installation Manager Tool

Commit MetaInfo

• Révision: 2e5e8d50c4490b32b666efc42a7ea07b6e890f82 (tree)
• l'heure: 2020-06-21 20:31:36
• Auteur: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Message de Log

Ensure non-void functions always return explicit values.

Change Summary

• modified: ChangeLog
• modified: src/dmhguix.cpp
• modified: src/guimain.cpp

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Ensure non-void functions always return explicit values.
+
+	* src/guimain.cpp (WinMain): Remove explicit EXIT_FAILURE returns from
+	individual exception handlers; relocate it to the default execution
+	path, to which all such handlers will fall through.
+
+	* src/dmhguix.cpp (dmhTypeGUI::notify) [DMH_COMPILE_DIGEST]: Return
+	number of bytes added to message queue; fall through, to return zero,
+	on failure to extend the queue.
+
 2020-06-20  Keith Marshall  <[e-mail]>
 
 	Simplify numeric argument interpreter function.

--- a/src/dmhguix.cpp
+++ b/src/dmhguix.cpp
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2009-2013, MinGW.org Project
+ * Written by Keith Marshall <[e-mail]>
+ * Copyright (C) 2009-2013, 2020, MinGW.org Project
  *
  *
  * Implementation of GUI specific API extensions, providing support
@@ -395,6 +395,7 @@ int dmhTypeGUI::notify( const dmh_severity code, const char *fmt, va_list argv )
        * to the buffered collection.
        */
       msglen += vsprintf( (msgbuf = newbuf) + msglen, fmt, argv );
+      return newlen - 1;
     }
   }
   else if( (msgbuf = (char *)(malloc( newlen ))) != NULL )
@@ -406,6 +407,10 @@ int dmhTypeGUI::notify( const dmh_severity code, const char *fmt, va_list argv )
     mode = code | (mode & ~DMH_SEVERITY_MASK);
     return dispatch_message( vsprintf( msgbuf, fmt, argv ) );
   }
+  /* If we get to here, then no message was dispatched; the
+   * effective message length should be returned as zero.
+   */
+  return 0;
 }
 
 static inline HWND last_active_popup( HWND owner )

--- a/src/guimain.cpp
+++ b/src/guimain.cpp
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2012, 2013, MinGW.org Project
+ * Written by Keith Marshall <[e-mail]>
+ * Copyright (C) 2012, 2013, 2020, MinGW.org Project
  *
  *
  * Implementation of the WinMain() function, providing the program
@@ -95,7 +95,6 @@ int APIENTRY WinMain
      * and identified by the diagnostic message handler...
      */
     MessageBox( NULL, e.what(), "WinMain", MB_ICONERROR );
-    return EXIT_FAILURE;
   }
   catch( runtime_error &e )
   {
@@ -104,15 +103,14 @@ int APIENTRY WinMain
      * processing of its message loop...
      */
     MessageBox( NULL, e.what(), "WinMain", MB_ICONERROR );
-    return EXIT_FAILURE;
   }
   catch(...)
   { /* ...and here, we diagnose any other error which we weren't
      * able to explicitly identify.
      */
     MessageBox( NULL, "Unknown exception", "WinMain", MB_ICONERROR );
-    return EXIT_FAILURE;
   }
+  return EXIT_FAILURE;
 }
 
 /* $RCSfile$: end of file */