luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 23:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename all struct members named: read, write, close, truncate, or mount to

Browse Source 
2007-12-05  Alexander Larsson  <alexl@redhat.com>

        * gbufferedinputstream.c:
        * gbufferedoutputstream.c:
        * gdrive.[ch]:
        * gfile.[ch]:
        * gfileenumerator.[ch]:
        * gfileinputstream.c:
        * gfileoutputstream.[ch]:
        * gfilterinputstream.c:
        * gfilteroutputstream.c:
        * ginputstream.[ch]:
        * glocalfile.c:
        * glocalfileenumerator.c:
        * glocalfileinputstream.c:
        * glocalfileoutputstream.c:
        * gmemoryinputstream.c:
        * gmemoryoutputstream.c:
        * goutputstream.[ch]:
        * gseekable.[ch]:
        * gunixdrive.c:
        * gunixinputstream.c:
        * gunixoutputstream.c:
	Rename all struct members named:
	read, write, close, truncate, or mount
	to foo_fn, as these are reserved names
	and could be defined as macros in libc.
	(#501645)


svn path=/trunk/; revision=6048
This commit is contained in:
Alexander Larsson
2007-12-05 10:38:03 +00:00
committed by Alexander Larsson
parent a8a42c8b15
commit 2c362b7f9e
29 changed files with 114 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gfile.c
View File

@@ -999,7 +999,7 @@ g_file_read (GFile *file,
iface = G_FILE_GET_IFACE (file);
if (iface->read == NULL)
if (iface->read_fn == NULL)
{
g_set_error (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
@@ -1007,7 +1007,7 @@ g_file_read (GFile *file,
return NULL;
}
return (* iface->read) (file, cancellable, error);
return (* iface->read_fn) (file, cancellable, error);
}
/**
@@ -3369,7 +3369,7 @@ open_read_async_thread (GSimpleAsyncResult *res,
iface = G_FILE_GET_IFACE (object);
stream = iface->read (G_FILE (object), cancellable, &error);
stream = iface->read_fn (G_FILE (object), cancellable, &error);
if (stream == NULL)
{