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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.417 by root, Mon Jul 21 16:51:31 2008 UTC

   wchar_t ch = NOCHAR;
   char *seq_begin; // remember start of esc-sequence here
   for (;;)
     {
-      if (ch == NOCHAR)
+      if (expect_false (ch == NOCHAR))
         {
           seq_begin = cmdbuf_ptr;
           ch = next_char ();
           if (ch == NOCHAR)
             break;
         }
-      if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
+      if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
         {
-          if (!seen_input)
+          if (expect_false (!seen_input))
             {
               seen_input = 1;
               // many badly-written programs (e.g. jed) contain a race condition:
               // they first read the screensize and then install a SIGWINCH handler.
               // some window managers resize the window early, and these programs
           wchar_t *str = buf;
           wchar_t *eol = str + min (ncol, UBUFSIZ);
           for (;;)
             {
-              if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
+              if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
                 break;
               *str++ = ch;
-              if (ch == C0_LF || str >= eol)
+              if (expect_false (ch == C0_LF || str >= eol))
                 {
                   if (ch == C0_LF)
                     nlines++;
                   refresh_count++;
 rxvt_term::next_char () NOTHROW
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
       // assume 7-bit to be ascii ALWAYS
-      if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
+      if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
         return *cmdbuf_ptr++;
       wchar_t wc;
       size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
 /*----------------------------------------------------------------------*/
 #ifdef PRINTPIPE
 FILE *
 rxvt_term::popen_printer ()
 {
-  FILE *stream = popen (rs[Rs_print_pipe], "w");
+  FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
   if (stream == NULL)
     rxvt_warn ("can't open printer pipe, not printing.\n");
   return stream;
  * simulate attached vt100 printer
  */
 void
 rxvt_term::process_print_pipe ()
 {
-  int done;
+  FILE *fd = popen_printer ();
-  FILE *fd;
-  if ((fd = popen_printer ()) == NULL)
+  if (!fd)
     return;
   /*
    * Send all input to the printer until either ESC[4i or ESC[?4i
    * is received.
    */
-  for (done = 0; !done;)
+  for (int done = 0; !done; )
     {
       unsigned char buf[8];
       unicode_t ch;
       unsigned int i, len;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs. Revision 1.417 by root, Mon Jul 21 16:51:31 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.417 by root, Mon Jul 21 16:51:31 2008 UTC