luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gio: Add private API to create win32 streams from fds"

Browse Source 
This reverts commit 292de8cc52.
This commit is contained in:
Michael Natterer 2012-11-15 15:22:52 +01:00
parent 75de24ca66
commit 6dee874b68
4 changed files with 20 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gio/Makefile.am
View File

@ -392,7 +392,6 @@ libgio_2_0_la_SOURCES = \
giomodule-priv.h \ giomodule-priv.h \
gioscheduler.c \ gioscheduler.c \
giostream.c \ giostream.c \
giowin32-priv.h \
gloadableicon.c \ gloadableicon.c \
gmount.c \ gmount.c \
gmemoryinputstream.c \ gmemoryinputstream.c \

43
gio/giowin32-priv.h
View File

@ -1,43 +0,0 @@
/* GIO - GLib Input, Output and Streaming Library
*
* Copyright (C) 2012 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
* Author: Colin Walters <walters@verbum.org>
*/
#ifndef __G_IO_WIN32_PRIV_H__
#define __G_IO_WIN32_PRIV_H__
#include "gwin32inputstream.h"
#include "gwin32outputstream.h"
G_BEGIN_DECLS
G_GNUC_INTERNAL
GInputStream *
g_win32_input_stream_new_from_fd (gint fd,
gboolean close_fd);
G_GNUC_INTERNAL
GOutputStream *
g_win32_output_stream_new_from_fd (gint fd,
gboolean close_fd);
G_END_DECLS
#endif /* __G_IO_MODULE_PRIV_H__ */

48
gio/gwin32inputstream.c
View File

@ -61,7 +61,6 @@ G_DEFINE_TYPE (GWin32InputStream, g_win32_input_stream, G_TYPE_INPUT_STREAM);
struct _GWin32InputStreamPrivate { struct _GWin32InputStreamPrivate {
HANDLE handle; HANDLE handle;
gboolean close_handle; gboolean close_handle;
gint fd;
}; };
static void g_win32_input_stream_set_property (GObject *object, static void g_win32_input_stream_set_property (GObject *object,
@ -188,7 +187,6 @@ g_win32_input_stream_init (GWin32InputStream *win32_stream)
win32_stream->priv->handle = NULL; win32_stream->priv->handle = NULL;
win32_stream->priv->close_handle = TRUE; win32_stream->priv->close_handle = TRUE;
win32_stream->priv->fd = -1;
} }
/** /**
@ -378,45 +376,19 @@ g_win32_input_stream_close (GInputStream *stream,
if (!win32_stream->priv->close_handle) if (!win32_stream->priv->close_handle)
return TRUE; return TRUE;
if (win32_stream->priv->fd != -1) res = CloseHandle (win32_stream->priv->handle);
if (!res)
{ {
int errsv = errno; int errsv = GetLastError ();
if (close (win32_stream->priv->fd) < 0) gchar *emsg = g_win32_error_message (errsv);
{
g_set_error_literal (error, G_IO_ERROR,
g_io_error_from_errno (errsv),
g_strerror (errsv));
return FALSE;
}
}
else
{
res = CloseHandle (win32_stream->priv->handle);
if (!res)
{
int errsv = GetLastError ();
gchar *emsg = g_win32_error_message (errsv);
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_win32_error (errsv), g_io_error_from_win32_error (errsv),
_("Error closing handle: %s"), _("Error closing handle: %s"),
emsg); emsg);
g_free (emsg); g_free (emsg);
return FALSE; return FALSE;
}
} }
return TRUE; return TRUE;
} }
GInputStream *
g_win32_input_stream_new_from_fd (gint fd,
gboolean close_fd)
{
GWin32InputStream *win32_stream;
win32_stream = G_WIN32_INPUT_STREAM (g_win32_input_stream_new ((HANDLE) _get_osfhandle (fd), close_fd));
win32_stream->priv->fd = fd;
return (GInputStream*)win32_stream;
}

48
gio/gwin32outputstream.c
View File

@ -63,7 +63,6 @@ G_DEFINE_TYPE (GWin32OutputStream, g_win32_output_stream, G_TYPE_OUTPUT_STREAM);
struct _GWin32OutputStreamPrivate { struct _GWin32OutputStreamPrivate {
HANDLE handle; HANDLE handle;
gboolean close_handle; gboolean close_handle;
gint fd;
}; };
static void g_win32_output_stream_set_property (GObject *object, static void g_win32_output_stream_set_property (GObject *object,
@ -191,7 +190,6 @@ g_win32_output_stream_init (GWin32OutputStream *win32_stream)
win32_stream->priv->handle = NULL; win32_stream->priv->handle = NULL;
win32_stream->priv->close_handle = TRUE; win32_stream->priv->close_handle = TRUE;
win32_stream->priv->fd = -1;
} }
/** /**
@ -366,45 +364,19 @@ g_win32_output_stream_close (GOutputStream *stream,
if (!win32_stream->priv->close_handle) if (!win32_stream->priv->close_handle)
return TRUE; return TRUE;
if (win32_stream->priv->fd != -1) res = CloseHandle (win32_stream->priv->handle);
if (!res)
{ {
int errsv = errno; int errsv = GetLastError ();
if (close (win32_stream->priv->fd) < 0) gchar *emsg = g_win32_error_message (errsv);
{
g_set_error_literal (error, G_IO_ERROR,
g_io_error_from_errno (errsv),
g_strerror (errsv));
return FALSE;
}
}
else
{
res = CloseHandle (win32_stream->priv->handle);
if (!res)
{
int errsv = GetLastError ();
gchar *emsg = g_win32_error_message (errsv);
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_win32_error (errsv), g_io_error_from_win32_error (errsv),
_("Error closing handle: %s"), _("Error closing handle: %s"),
emsg); emsg);
g_free (emsg); g_free (emsg);
return FALSE; return FALSE;
}
} }
return TRUE; return TRUE;
} }
GOutputStream *
g_win32_output_stream_new_from_fd (gint fd,
gboolean close_fd)
{
GWin32OutputStream *win32_stream;
win32_stream = G_WIN32_OUTPUT_STREAM (g_win32_output_stream_new ((HANDLE) _get_osfhandle (fd), close_fd));
win32_stream->priv->fd = fd;
return (GOutputStream*)win32_stream;
}