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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.114 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.116 by ayin, Thu Oct 11 16:01:27 2007 UTC

                * default values
                */
               if (optList[entry].doff != -1)
                 {
-                  if (flag == resval_on && !argv [i+1])
+                  if (flag == resval_on && i+1 == argc)
                     rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
                   rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
                 }
             }
         }
       else
 #ifdef KEYSYM_RESOURCE
         if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
           {
-            const char *str = argv[++i];
+            if (i+1 < argc)
-            if (str != NULL)
-              parse_keysym (opt + sizeof ("keysym.") - 1, str);
+              parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
           }
         else
 #endif
           {
             bad_option = 1;
   XrmGetResource (database, resource, resource, &type, &result);
   return result.addr;
 }
-const char *
+static const char *
-rxvt_term::x_resource (const char *name)
+x_resource (const char *name)
 {
   XrmDatabase database = XrmGetDatabase (dpy);
   const char *p = get_res (database, rs[Rs_name], name);
   const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);

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