metacity r3510 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Tue Jan  8 03:13:17 2008
New Revision: 3510
URL: http://svn.gnome.org/viewvc/metacity?rev=3510&view=rev

Log:
2008-01-07  Thomas Thurman  <tthurman gnome org>

        * src/core/main.c (main): g_free is a no-op on nulls; there is no
       need to test.




Modified:
   trunk/ChangeLog
   trunk/src/core/main.c

Modified: trunk/src/core/main.c
==============================================================================
--- trunk/src/core/main.c	(original)
+++ trunk/src/core/main.c	Tue Jan  8 03:13:17 2008
@@ -402,12 +402,9 @@
   /* Free memory possibly allocated by the argument parsing which are
    * no longer needed.
    */
-  if (meta_args.save_file)
-    g_free (meta_args.save_file);
-  if (meta_args.display_name)
-    g_free (meta_args.display_name);
-  if (meta_args.client_id)
-    g_free (meta_args.client_id);
+  g_free (meta_args.save_file);
+  g_free (meta_args.display_name);
+  g_free (meta_args.client_id);
   
   if (!meta_display_open ())
     meta_exit (META_EXIT_ERROR);