diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-12-17 16:09:21 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2008-12-17 16:09:21 +0000 |
| commit | a7db96e7cf48751fa5646129fd0c4c5e82e6b50e (patch) | |
| tree | cbbce414157532ca65141511f6bc5a4d96a2eafa /gnome-settings-daemon | |
| parent | 1180eafb068c8bda982b39b45edaec9a30578466 (diff) | |
| download | gnome-settings-daemon-a7db96e7cf48751fa5646129fd0c4c5e82e6b50e.tar.gz | |
Rename pipefds to daemon_pipe_fds. This fits the naming style of the
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.
svn path=/trunk/; revision=634
Diffstat (limited to 'gnome-settings-daemon')
| -rw-r--r-- | gnome-settings-daemon/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c index 520a2f04..b6d40db9 100644 --- a/gnome-settings-daemon/main.c +++ b/gnome-settings-daemon/main.c @@ -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 @@ daemon_start (void) 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 @@ daemon_start (void) 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 @@ daemon_terminate_parent (void) 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 |