[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.303 by sf-exg, Sat Dec 3 11:47:31 2011 UTC vs.
Revision 1.304 by sf-exg, Tue Dec 6 10:27:15 2011 UTC

 /*----------------------------------------------------------------------*/
 const char **
 rxvt_term::init_resources (int argc, const char *const *argv)
 {
   int i, r_argc;
-  const char **cmd_argv, **r_argv;
+  const char **cmd_argv;
   /*
    * Look for -e option. Find => split and make cmd_argv[] of command args
    */
   for (r_argc = 0; r_argc < argc; r_argc++)
         cmd_argv[i] = (const char *)argv[i + r_argc + 1];
       cmd_argv[i] = NULL;
     }
-  r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
-  for (i = 0; i < r_argc; i++)
-    r_argv[i] = (const char *)argv[i];
-  r_argv[i] = NULL;
   rs[Rs_name] = rxvt_basename (argv[0]);
   /*
    * Open display, get options/resources and create the window
    */
   if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
     rs[Rs_display_name] = ":0";
-  get_options (r_argc, r_argv);
+  get_options (r_argc, argv);
   if (!(display = displays.get (rs[Rs_display_name])))
     rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
   // using a local pointer decreases code size a lot
 #if XFT
   if (rs[Rs_depth])
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
-  free (r_argv);
   for (int i = NUM_RESOURCES; i--; )
     if (rs [i] == resval_undef)
       rs [i] = 0;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines