gnome-settings-daemon r634 - in trunk: . gnome-settings-daemon
- From: halfline svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-settings-daemon r634 - in trunk: . gnome-settings-daemon
- Date: Wed, 17 Dec 2008 16:09:21 +0000 (UTC)
Author: halfline
Date: Wed Dec 17 16:09:21 2008
New Revision: 634
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=634&view=rev
Log:
2008-12-07 Ray Strode <rstrode redhat com>
* gnome-settings-daemon/main.c: Rename pipefds to
daemon_pipe_fds. This fits the naming style of the
surrounding code better. Also, we're going to need
another pipe, so better to use a specific name here.
Modified:
trunk/ChangeLog
trunk/gnome-settings-daemon/main.c
Modified: trunk/gnome-settings-daemon/main.c
==============================================================================
--- trunk/gnome-settings-daemon/main.c (original)
+++ trunk/gnome-settings-daemon/main.c Wed Dec 17 16:09:21 2008
@@ -47,7 +47,7 @@
static char *gconf_prefix = NULL;
static gboolean no_daemon = FALSE;
static gboolean debug = FALSE;
-static int pipefds[2];
+static int daemon_pipe_fds[2];
static GOptionEntry entries[] = {
{"debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
@@ -247,7 +247,7 @@
gnome_settings_profile_msg ("forking daemon");
signal (SIGPIPE, SIG_IGN);
- if (-1 == pipe (pipefds)) {
+ if (-1 == pipe (daemon_pipe_fds)) {
g_error ("Could not create pipe: %s", g_strerror (errno));
exit (EXIT_FAILURE);
}
@@ -262,17 +262,17 @@
case 0:
/* child */
- close (pipefds[0]);
+ close (daemon_pipe_fds[0]);
return;
default:
/* parent */
- close (pipefds[1]);
+ close (daemon_pipe_fds[1]);
/* Wait for child to signal that we are good to go. */
- read (pipefds[0], buf, 1);
+ read (daemon_pipe_fds[0], buf, 1);
exit (EXIT_SUCCESS);
}
@@ -305,8 +305,8 @@
gnome_settings_profile_msg ("terminating parent");
- write (pipefds[1], "1", 1);
- close (pipefds[1]);
+ write (daemon_pipe_fds[1], "1", 1);
+ close (daemon_pipe_fds[1]);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]