From 3e01bbaafb43986d5d79f8499a98ae8762ea47f9 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Wed, 16 Dec 1998 14:57:42 +0000 Subject: [PATCH] Fixed small bug. 1998-12-16 Sebastian Wilhelmi * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ giounix.c | 2 +- glib/giounix.c | 2 +- 10 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9e057fcd..323c0a273 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c9e057fcd..323c0a273 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c9e057fcd..323c0a273 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c9e057fcd..323c0a273 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c9e057fcd..323c0a273 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c9e057fcd..323c0a273 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c9e057fcd..323c0a273 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c9e057fcd..323c0a273 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +1998-12-16 Sebastian Wilhelmi + + * giounix.c (g_io_channel_unix_get_fd): Fixed small bug. + 1998-12-16 Joel Becker * glib.h, gscanner.c: changed func_data to user_data in diff --git a/giounix.c b/giounix.c index 23fc69f0e..72239c715 100644 --- a/giounix.c +++ b/giounix.c @@ -297,6 +297,6 @@ g_io_channel_unix_new (gint fd) gint g_io_channel_unix_get_fd (GIOChannel *channel) { - GIOUnixChannel *unix_channel = g_new (GIOUnixChannel, 1); + GIOUnixChannel *unix_channel = (GIOUnixChannel *)channel; return unix_channel->fd; } diff --git a/glib/giounix.c b/glib/giounix.c index 23fc69f0e..72239c715 100644 --- a/glib/giounix.c +++ b/glib/giounix.c @@ -297,6 +297,6 @@ g_io_channel_unix_new (gint fd) gint g_io_channel_unix_get_fd (GIOChannel *channel) { - GIOUnixChannel *unix_channel = g_new (GIOUnixChannel, 1); + GIOUnixChannel *unix_channel = (GIOUnixChannel *)channel; return unix_channel->fd; }