projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GVariant: support serialising to GVariantVectors
[platform/upstream/glib.git]
/
gio
/
glocalfileoutputstream.c
diff --git
a/gio/glocalfileoutputstream.c
b/gio/glocalfileoutputstream.c
index
ccee49d
..
b8fd45c
100644
(file)
--- a/
gio/glocalfileoutputstream.c
+++ b/
gio/glocalfileoutputstream.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
@@
-25,9
+23,6
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
@@
-41,6
+36,7
@@
#include "glocalfileinfo.h"
#ifdef G_OS_UNIX
#include "glocalfileinfo.h"
#ifdef G_OS_UNIX
+#include <unistd.h>
#include "gfiledescriptorbased.h"
#endif
#include "gfiledescriptorbased.h"
#endif
@@
-58,6
+54,15
@@
#define O_BINARY 0
#endif
#define O_BINARY 0
#endif
+struct _GLocalFileOutputStreamPrivate {
+ char *tmp_filename;
+ char *original_filename;
+ char *backup_filename;
+ char *etag;
+ guint sync_on_close : 1;
+ guint do_close : 1;
+ int fd;
+};
#ifdef G_OS_UNIX
static void g_file_descriptor_based_iface_init (GFileDescriptorBasedIface *iface);
#ifdef G_OS_UNIX
static void g_file_descriptor_based_iface_init (GFileDescriptorBasedIface *iface);
@@
-66,11
+71,12
@@
static void g_file_descriptor_based_iface_init (GFileDescriptorBasedIfac
#define g_local_file_output_stream_get_type _g_local_file_output_stream_get_type
#ifdef G_OS_UNIX
G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM,
#define g_local_file_output_stream_get_type _g_local_file_output_stream_get_type
#ifdef G_OS_UNIX
G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM,
+ G_ADD_PRIVATE (GLocalFileOutputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_FILE_DESCRIPTOR_BASED,
G_IMPLEMENT_INTERFACE (G_TYPE_FILE_DESCRIPTOR_BASED,
- g_file_descriptor_based_iface_init)
- );
+ g_file_descriptor_based_iface_init))
#else
#else
-G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM,);
+G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM,
+ G_ADD_PRIVATE (GLocalFileOutputStream))
#endif
#endif
@@
-80,16
+86,6
@@
G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_T
#define BACKUP_EXTENSION "~"
#define BACKUP_EXTENSION "~"
-struct _GLocalFileOutputStreamPrivate {
- char *tmp_filename;
- char *original_filename;
- char *backup_filename;
- char *etag;
- guint sync_on_close : 1;
- guint do_close : 1;
- int fd;
-};
-
static gssize g_local_file_output_stream_write (GOutputStream *stream,
const void *buffer,
gsize count,
static gssize g_local_file_output_stream_write (GOutputStream *stream,
const void *buffer,
gsize count,
@@
-134,16
+130,13
@@
g_local_file_output_stream_finalize (GObject *object)
G_OBJECT_CLASS (g_local_file_output_stream_parent_class)->finalize (object);
}
G_OBJECT_CLASS (g_local_file_output_stream_parent_class)->finalize (object);
}
-
static void
g_local_file_output_stream_class_init (GLocalFileOutputStreamClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GOutputStreamClass *stream_class = G_OUTPUT_STREAM_CLASS (klass);
GFileOutputStreamClass *file_stream_class = G_FILE_OUTPUT_STREAM_CLASS (klass);
static void
g_local_file_output_stream_class_init (GLocalFileOutputStreamClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GOutputStreamClass *stream_class = G_OUTPUT_STREAM_CLASS (klass);
GFileOutputStreamClass *file_stream_class = G_FILE_OUTPUT_STREAM_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (GLocalFileOutputStreamPrivate));
-
+
gobject_class->finalize = g_local_file_output_stream_finalize;
stream_class->write_fn = g_local_file_output_stream_write;
gobject_class->finalize = g_local_file_output_stream_finalize;
stream_class->write_fn = g_local_file_output_stream_write;
@@
-168,9
+161,7
@@
g_file_descriptor_based_iface_init (GFileDescriptorBasedIface *iface)
static void
g_local_file_output_stream_init (GLocalFileOutputStream *stream)
{
static void
g_local_file_output_stream_init (GLocalFileOutputStream *stream)
{
- stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
- G_TYPE_LOCAL_FILE_OUTPUT_STREAM,
- GLocalFileOutputStreamPrivate);
+ stream->priv = g_local_file_output_stream_get_instance_private (stream);
stream->priv->do_close = TRUE;
}
stream->priv->do_close = TRUE;
}
@@
-270,7
+261,7
@@
_g_local_file_output_stream_really_close (GLocalFileOutputStream *file,
if (g_cancellable_set_error_if_cancelled (cancellable, error))
goto err_out;
if (g_cancellable_set_error_if_cancelled (cancellable, error))
goto err_out;
-#ifdef
HAVE_LINK
+#ifdef
G_OS_UNIX
/* create original -> backup link, the original is then renamed over */
if (g_unlink (file->priv->backup_filename) != 0 &&
errno != ENOENT)
/* create original -> backup link, the original is then renamed over */
if (g_unlink (file->priv->backup_filename) != 0 &&
errno != ENOENT)