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

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.36 by root, Sat Nov 17 07:28:00 2007 UTC vs.
Revision 1.41 by root, Tue Dec 4 16:24:00 2007 UTC

   void read_cb (ev::io &w, int revents); ev::io read_ev;
   void log_msg (const char *msg);
   int getfd (int remote_fd);
   server (int fd)
-  : read_ev (this, &server::read_cb),
-    log_cb (this, &server::log_msg),
-    getfd_cb (this, &server::getfd)
   {
+    read_ev.set <server, &server::read_cb> (this);
+    log_cb.set  <server, &server::log_msg> (this);
+    getfd_cb.set<server, &server::getfd>   (this);
+    this->fd = fd;
     fcntl (fd, F_SETFD, FD_CLOEXEC);
     fcntl (fd, F_SETFL, 0);
     read_ev.start (fd, ev::READ);
   }
   unix_listener (const char *sockname);
 };
 unix_listener::unix_listener (const char *sockname)
-: accept_ev (this, &unix_listener::accept_cb)
 {
+  accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
   sockaddr_un sa;
   if (strlen (sockname) >= sizeof(sa.sun_path))
     {
       fputs ("socket name too long, aborting.\n", stderr);
           rxvt_log ("unable to fork daemon, aborting.\n");
           return EXIT_FAILURE;
         }
       else if (pid > 0)
         _exit (EXIT_SUCCESS);
-    }
+      ev_default_fork ();
+    }
-  ev::ev_loop (0);
+  ev_loop (0);
   return EXIT_SUCCESS;
 }

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