[gnome-terminal/gsettings] server: No need to memdup the FD array
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal/gsettings] server: No need to memdup the FD array
- Date: Mon, 16 Apr 2012 12:02:45 +0000 (UTC)
commit 6f4b998d9b21384403ca991961580c2d9aeabcc4
Author: Christian Persch <chpe gnome org>
Date: Mon Apr 16 13:27:13 2012 +0200
server: No need to memdup the FD array
src/terminal-screen.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 09050be..2ef315a 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -56,7 +56,7 @@
typedef struct {
GUnixFDList *fd_list;
- int *fd_array;
+ const int *fd_array;
gsize fd_array_len;
} FDSetupData;
@@ -722,12 +722,9 @@ terminal_screen_exec (TerminalScreen *screen,
priv->initial_working_directory = g_strdup (cwd);
if (fd_list) {
- const int *fd_array_data;
-
data = g_new (FDSetupData, 1);
data->fd_list = fd_list;
- fd_array_data = g_variant_get_fixed_array (fd_array, &data->fd_array_len, 2 * sizeof (int));
- data->fd_array = g_memdup (fd_array_data, data->fd_array_len * 2 * sizeof (int));
+ data->fd_array = g_variant_get_fixed_array (fd_array, &data->fd_array_len, 2 * sizeof (int));
} else
data = NULL;
@@ -1377,14 +1374,13 @@ info_bar_response_cb (GtkWidget *info_bar,
static void
free_fd_setup_data (FDSetupData *data)
{
- g_free (data->fd_array);
g_free (data);
}
static void
terminal_screen_child_setup (FDSetupData *data)
{
- int *fd_array = data->fd_array;
+ const int *fd_array = data->fd_array;
gsize fd_array_len = data->fd_array_len;
gsize i;
int *fds, n_fds, j, r;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]