+2009-02-22 Matthias Clasen <mclasen@redhat.com>
+
+ Bug 572151 – “it's” and “its” confused in docs and comments
+
+ * Fix "it's" vs "its" confusion throughout the source. Patch
+ by Will Thompson.
+
2009-02-22 Matthias Clasen <mclasen@redhat.com>
Bug 572464 – Doc for g_file_get_contents
}
}
- /* This should always succeed, since its in the buffer */
+ /* This should always succeed, since it's in the buffer */
res = g_input_stream_read (G_INPUT_STREAM (stream),
buffer, size,
NULL, NULL);
list[i++] = g_strdup (old_list[j]);
else if (add_non_default)
{
- /* If adding as non-default, and its already in,
+ /* If adding as non-default, and it's already in,
don't change order of desktop ids */
add_non_default = FALSE;
list[i++] = g_strdup (old_list[j]);
* @include: gio/gio.h
*
* #GDrive - this represent a piece of hardware connected to the machine.
- * Its generally only created for removable hardware or hardware with
+ * It's generally only created for removable hardware or hardware with
* removable media.
*
* #GDrive is a container class for #GVolume objects that stem from
{
int min, max, med;
GFileAttribute *attrs;
- /* Binary search for the place where attribute would be, if its
+ /* Binary search for the place where attribute would be, if it's
in the array */
min = 0;
* G_FILE_ATTRIBUTE_STANDARD_COPY_NAME:
*
* A key in the "standard" namespace for getting the copy name of the file.
- * The copy name is an optional version of the name. If availible its always
+ * The copy name is an optional version of the name. If available it's always
* in UTF8, and corresponds directly to the original filename (only transcoded to
* UTF8). This is useful if you want to copy the file to another filesystem that
* might have a different encoding. If the filename is not a valid string in the
return NULL;
}
- /* Its safe to register the same type multiple times */
+ /* It's safe to register the same type multiple times */
for (l = extension_point->extensions; l != NULL; l = l->next)
{
extension = l->data;
g_thread_pool_set_sort_function (job_thread_pool,
g_io_job_compare,
NULL);
- /* Its kinda weird that this is a global setting
+ /* It's kinda weird that this is a global setting
* instead of per threadpool. However, we really
* want to cache some threads, but not keep around
* those threads forever. */
static const char *
get_fs_type (long f_type)
{
+ g_print ("get fstype for %ld\n", f_type);
/* filesystem ids taken from linux manpage */
switch (f_type)
return "befs";
case 0x1BADFACE:
return "bfs";
+ case 0x9123683E:
+ return "btrfs";
case 0xFF534D42:
return "cifs";
case 0x73757245:
return "romfs";
case 0x517B:
return "smb";
+ case 0x73717368:
+ return "squashfs";
case 0x012FF7B6:
return "sysv2";
case 0x012FF7B5:
#endif
GFileAttributeMatcher *attribute_matcher;
+ g_print ("g_local_file_query_filesystem_info\n");
no_size = FALSE;
#ifdef USE_STATFS
#ifdef USE_STATFS
#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
fstype = g_strdup(statfs_buffer.f_fstypename);
+ g_print ("using f_fstypename %s\n", fstype);
#else
fstype = get_fs_type (statfs_buffer.f_type);
+ g_print ("using f_type %s\n", fstype);
#endif
#elif defined(USE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
int errsv = errno;
/* Posix allows EEXIST too, but the more sane error
- is G_IO_ERROR_NOT_FOUND, and its what nautilus
+ is G_IO_ERROR_NOT_FOUND, and it's what nautilus
expects */
if (errsv == EEXIST)
errsv = ENOTEMPTY;
#endif
parent_info->owner = statbuf.st_uid;
parent_info->device = statbuf.st_dev;
- /* No need to find trash dir if its not writable anyway */
+ /* No need to find trash dir if it's not writable anyway */
if (parent_info->writable &&
g_file_attribute_matcher_matches (attribute_matcher, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH))
parent_info->has_trash_dir = _g_local_file_has_trash_dir (dir, statbuf.st_dev);
*
* If the return value is not %NULL, the caller must associate the
* returned #GVolume object with the #GMount. This involves returning
- * it in it's g_mount_get_volume() implementation. The caller must
+ * it in its g_mount_get_volume() implementation. The caller must
* also listen for the "removed" signal on the returned object
- * and give up it's reference when handling that signal
+ * and give up its reference when handling that signal
*
* Similary, if implementing g_volume_monitor_adopt_orphan_mount(),
* the implementor must take a reference to @mount and return it in
- * it's g_volume_get_mount() implemented. Also, the implementor must
- * listen for the "unmounted" signal on @mount and give up it's
+ * its g_volume_get_mount() implemented. Also, the implementor must
+ * listen for the "unmounted" signal on @mount and give up its
* reference upon handling that signal.
*
* There are two main use cases for this function.
* One is when implementing a user space file system driver that reads
* blocks of a block device that is already represented by the native
* volume monitor (for example a CD Audio file system driver). Such
- * a driver will generate it's own #GMount object that needs to be
+ * a driver will generate its own #GMount object that needs to be
* assoicated with the #GVolume object that represents the volume.
*
* The other is for implementing a #GVolumeMonitor whose sole purpose
*
* We do this to avoid being fooled by --bind mounts, since
* these have the same device as the location they bind to.
- * Its not an ideal solution to the problem, but it's likely that
+ * It's not an ideal solution to the problem, but it's likely that
* the most important mountpoint is first and the --bind ones after
* that aren't as important. So it should work.
*
* @volume_monitor: a #GVolumeMonitor.
* @uuid: the UUID to look for
*
- * Finds a #GVolume object by it's UUID (see g_volume_get_uuid())
+ * Finds a #GVolume object by its UUID (see g_volume_get_uuid())
*
* Returns: a #GVolume or %NULL if no such volume is available.
* Free the returned object with g_object_unref().
* @volume_monitor: a #GVolumeMonitor.
* @uuid: the UUID to look for
*
- * Finds a #GMount object by it's UUID (see g_mount_get_uuid())
+ * Finds a #GMount object by its UUID (see g_mount_get_uuid())
*
* Returns: a #GMount or %NULL if no such mount is available.
* Free the returned object with g_object_unref().
* @state: Saved state between steps, initialize to 0
* @save: Saved state between steps, initialize to 0
*
- * Incrementally encode a sequence of binary data into it's Base-64 stringified
+ * Incrementally encode a sequence of binary data into its Base-64 stringified
* representation. By calling this function multiple times you can convert
* data in chunks to avoid having to have the full encoded data in memory.
*
* g_checksum_reset:
* @checksum: the #GChecksum to reset
*
- * Resets the state of the @checksum back to it's initial state.
+ * Resets the state of the @checksum back to its initial state.
*
* Since: 2.18
**/
* <listitem><para>
* The reference counting of #GClosure makes it easy to handle reentrancy
* right; if a callback is removed while it is being invoked, the closure
- * and it's parameters won't be freed until the invocation finishes.
+ * and its parameters won't be freed until the invocation finishes.
* </para></listitem>
* <listitem><para>
* g_closure_invalidate() and invalidation notifiers allow callbacks to be
* g_closure_invalidate:
* @closure: GClosure to invalidate
*
- * Sets a flag on the closure to indicate that it's calling
+ * Sets a flag on the closure to indicate that its calling
* environment has become invalid, and thus causes any future
* invocations of g_closure_invoke() on this @closure to be
* ignored. Also, invalidation notifiers installed on the closure will
g_return_if_fail (closure != NULL);
g_return_if_fail (notify_func != NULL);
- if (closure->is_invalid && closure->in_inotify && /* account removal of notify_func() while its called */
+ if (closure->is_invalid && closure->in_inotify && /* account removal of notify_func() while it's called */
((gpointer) closure->marshal) == ((gpointer) notify_func) &&
closure->data == notify_data)
closure->marshal = NULL;
g_return_if_fail (closure != NULL);
g_return_if_fail (notify_func != NULL);
- if (closure->is_invalid && !closure->in_inotify && /* account removal of notify_func() while its called */
+ if (closure->is_invalid && !closure->in_inotify && /* account removal of notify_func() while it's called */
((gpointer) closure->marshal) == ((gpointer) notify_func) &&
closure->data == notify_data)
closure->marshal = NULL;
* @value_name: the name of the value
* @value_nick: the nickname of the value
*
- * A structure which contains a single enum value, it's name, and it's
+ * A structure which contains a single enum value, its name, and its
* nickname.
*/
struct _GEnumValue
* @value_name: the name of the value
* @value_nick: the nickname of the value
*
- * A structure which contains a single flags value, it's name, and it's
+ * A structure which contains a single flags value, its name, and its
* nickname.
*/
struct _GFlagsValue
/* parse & process file */
g_scanner_input_file (scanner, fd);
- /* scanning loop, we parse the input untill it's end is reached,
+ /* scanning loop, we parse the input until its end is reached,
* or our sub routine came across invalid syntax
*/
do
*
* This function gets back user data pointers stored via
* g_object_set_qdata() and removes the @data from object
- * without invoking it's destroy() function (if any was
+ * without invoking its destroy() function (if any was
* set).
* Usually, calling this function is only required to update
* user data pointers with a destroy notifier, for example:
* @quark: a #GQuark, naming the user data pointer
*
* Gets back user data pointers stored via g_param_spec_set_qdata()
- * and removes the @data from @pspec without invoking it's destroy()
+ * and removes the @data from @pspec without invoking its destroy()
* function (if any was set). Usually, calling this function is only
* required to update user data pointers with a destroy notifier.
*
* required to initialize and destruct (finalize) a parameter's class and
* instances thereof.
* The initialized structure is passed to the g_param_type_register_static()
- * The type system will perform a deep copy of this structure, so it's memory
+ * The type system will perform a deep copy of this structure, so its memory
* does not need to be persistent across invocation of
* g_param_type_register_static().
*/
{
/* this can happen in two cases:
* - our parent type already conformed to iface_type and node
- * got it's own holder info. here, our children already have
+ * got its own holder info. here, our children already have
* entries and NULL vtables, since this will only work for
* uninitialized classes.
* - an interface type is added to an ancestor after it was
projects / dana / cg-glib.git / commitdiff