[maemo-commits] [maemo-commits] r14013 - in projects/haf/trunk/osso-gnome-vfs2: daemon debian imported/neon libgnomevfs modules
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Sep 21 20:25:47 EEST 2007
- Previous message: [maemo-commits] r14012 - projects/haf/trunk/osso-gnome-vfs2/debian
- Next message: [maemo-commits] r14014 - projects/haf/trunk/osso-gnome-vfs2/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: martyn Date: 2007-09-21 20:25:36 +0300 (Fri, 21 Sep 2007) New Revision: 14013 Modified: projects/haf/trunk/osso-gnome-vfs2/daemon/vfs-daemon.c projects/haf/trunk/osso-gnome-vfs2/debian/changelog projects/haf/trunk/osso-gnome-vfs2/imported/neon/ne_request.c projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-daemon-method.c projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-job-queue.c projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info.c projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime.c projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-xfer.c projects/haf/trunk/osso-gnome-vfs2/modules/http-neon-method.c projects/haf/trunk/osso-gnome-vfs2/modules/smb-method.c Log: Fixed whitespace issues Modified: projects/haf/trunk/osso-gnome-vfs2/daemon/vfs-daemon.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/daemon/vfs-daemon.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/daemon/vfs-daemon.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -923,7 +923,7 @@ } setlocale(LC_ALL, ""); - + g_type_init (); gnome_vfs_set_is_daemon (GNOME_VFS_TYPE_VOLUME_MONITOR_DAEMON, Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/debian/changelog 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog 2007-09-21 17:25:36 UTC (rev 14013) @@ -3,7 +3,7 @@ * Fixes: NB#22048, Extra threads left running after changing the background * Plug a small leak in the volume monitor (patch 39) - -- Martyn Russell <martyn at imendio.com> Fri, 21 Sep 2007 17:34:00 +0100 + -- Richard Hult <richard at imendio.com> Fri, 21 Sep 2007 09:18:58 +0200 osso-gnome-vfs2 (2.16.3-1osso28) unstable; urgency=low Modified: projects/haf/trunk/osso-gnome-vfs2/imported/neon/ne_request.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/imported/neon/ne_request.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/imported/neon/ne_request.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -789,14 +789,14 @@ SOCK_ERR(req, ne_sock_readline(sock, req->respbuf, sizeof req->respbuf), _("Could not read chunk size")); - NE_DEBUG(NE_DBG_HTTP, "[chunk] < %s", req->respbuf); - chunk_len = strtoul(req->respbuf, &ptr, 16); - /* limit chunk size to <= UINT_MAX, so it will probably - * fit in a size_t. */ - if (ptr == req->respbuf || - chunk_len == ULONG_MAX || chunk_len > UINT_MAX) { - return aborted(req, _("Could not parse chunk size"), 0); - } + NE_DEBUG(NE_DBG_HTTP, "[chunk] < %s", req->respbuf); + chunk_len = strtoul(req->respbuf, &ptr, 16); + /* limit chunk size to <= UINT_MAX, so it will probably + * fit in a size_t. */ + if (ptr == req->respbuf || + chunk_len == ULONG_MAX || chunk_len > UINT_MAX) { + return aborted(req, _("Could not parse chunk size"), 0); + } NE_DEBUG(NE_DBG_HTTP, "Got chunk size: %lu\n", chunk_len); resp->body.chunk.remain = chunk_len; } @@ -1332,7 +1332,7 @@ for (rdr = req->body_readers; rdr != NULL; rdr=rdr->next) { rdr->use = rdr->accept_response(rdr->userdata, req, st); } - + return NE_OK; } Modified: projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-daemon-method.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-daemon-method.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-daemon-method.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -632,14 +632,14 @@ dbus_message_unref (message); - while (!dbus_pending_call_get_completed (pending_call) && - dbus_connection_read_write_dispatch (connection->connection, -1)) - ; + while (!dbus_pending_call_get_completed (pending_call) && + dbus_connection_read_write_dispatch (connection->connection, -1)) + ; - reply = dbus_pending_call_steal_reply (pending_call); + reply = dbus_pending_call_steal_reply (pending_call); - dbus_pending_call_unref (pending_call); - + dbus_pending_call_unref (pending_call); + if (cancellation_id != -1) { cancellation_id_free (cancellation_id, context); } Modified: projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-job-queue.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-job-queue.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-job-queue.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -1,8 +1,8 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* gnome-vfs-job-queue.c - Job queue for asynchronous GnomeVFSJobs - + Copyright (C) 2005 Christian Kellner - + The Gnome Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the @@ -58,14 +58,14 @@ /* FIXME: doesn't that leak here? */ return; } - + JOB_DEBUG (("locking job_lock %p", job->job_handle)); g_mutex_lock (job->job_lock); _gnome_vfs_async_job_map_unlock (); _gnome_vfs_job_execute (job); complete = _gnome_vfs_job_complete (job); - + JOB_DEBUG (("Unlocking access lock %p", job->job_handle)); g_mutex_unlock (job->job_lock); @@ -89,7 +89,7 @@ int prio_a; int prio_b; int retval; - + job_a = (GnomeVFSJob *) a; job_b = (GnomeVFSJob *) b; @@ -103,7 +103,7 @@ * second task should be processed first. * */ - + if (prio_a > prio_b) { return -1; } else if (prio_a < prio_b) { @@ -120,7 +120,7 @@ return retval; } -void +void _gnome_vfs_job_queue_init (void) { GError *err = NULL; @@ -146,15 +146,15 @@ _gnome_vfs_job_schedule (GnomeVFSJob *job) { GError *err = NULL; - + if (G_UNLIKELY (gnome_vfs_quitting)) { /* The application is quitting, the threadpool might already * be dead, just return FALSE * We are also not calling _gnome_vfs_async_job_completed * because the job map might also be dead */ g_warning ("Starting of GnomeVFS async calls after quit."); - return FALSE; - } + return FALSE; + } g_thread_pool_push (thread_pool, job, &err); @@ -164,11 +164,11 @@ /* thread did not start up, remove the job from the hash table */ _gnome_vfs_async_job_completed (job->job_handle); - + return FALSE; } - return TRUE; + return TRUE; } /** @@ -212,7 +212,7 @@ gnome_vfs_quitting = TRUE; while (gnome_vfs_job_get_count () != 0) { - + g_main_context_iteration (NULL, FALSE); g_usleep (20000); Modified: projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -379,7 +379,7 @@ entry->aliases = g_strdup (mime_type); } g_free (mime_type); - } + } } ret = read_next (reader); } Modified: projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -220,7 +220,7 @@ if (base_name == NULL) { return NULL; } - + mime_type = gnome_vfs_mime_type_from_name_or_default (base_name, NULL); g_free (base_name); return mime_type; Modified: projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -841,7 +841,7 @@ make_volume_name_from_path_and_fs (const char *mount_path, const char *fs_type) { const char *name; - + if (mount_path[0] == '/' && mount_path[1] == '\0') { return g_strdup (_("Root Volume")); } Modified: projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-xfer.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-xfer.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-xfer.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -2436,8 +2436,8 @@ * file system, so we just forge ahead and hope for the best */ target_dir_uri = gnome_vfs_uri_get_parent ((GnomeVFSURI *)target_uri_list->data); - result = gnome_vfs_get_volume_free_space (target_dir_uri, &free_bytes); - + result = gnome_vfs_get_volume_free_space (target_dir_uri, &free_bytes); + if (result == GNOME_VFS_OK) { if (!move && !link && progress->progress_info->bytes_total > free_bytes) { result = GNOME_VFS_ERROR_NO_SPACE; @@ -2512,7 +2512,7 @@ * Make sure we have space for the copies. */ target_dir_uri = gnome_vfs_uri_get_parent ((GnomeVFSURI *)merge_target_uri_list->data); - result = gnome_vfs_get_volume_free_space (target_dir_uri, &free_bytes); + result = gnome_vfs_get_volume_free_space (target_dir_uri, &free_bytes); if (result == GNOME_VFS_OK) { if (progress->progress_info->bytes_total > free_bytes) { Modified: projects/haf/trunk/osso-gnome-vfs2/modules/http-neon-method.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/modules/http-neon-method.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/modules/http-neon-method.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -1917,12 +1917,12 @@ result = resolve_result (res, req); if (result == GNOME_VFS_OK) { - const char *name; + const char *name; name = gnome_vfs_uri_get_path (context->uri); gnome_vfs_file_info_clear (info); - + info->name = g_path_get_basename (name); info->type = GNOME_VFS_FILE_TYPE_REGULAR; info->flags = GNOME_VFS_FILE_FLAGS_NONE; Modified: projects/haf/trunk/osso-gnome-vfs2/modules/smb-method.c =================================================================== --- projects/haf/trunk/osso-gnome-vfs2/modules/smb-method.c 2007-09-21 16:45:43 UTC (rev 14012) +++ projects/haf/trunk/osso-gnome-vfs2/modules/smb-method.c 2007-09-21 17:25:36 UTC (rev 14013) @@ -155,7 +155,7 @@ char *domain, int domainmaxlen, char *username, int unmaxlen, char *password, int pwmaxlen); - + #if 0 #define DEBUG_SMB_ENABLE #define DEBUG_SMB_LOCKS @@ -1756,7 +1756,7 @@ handle->file = file; *method_handle = (GnomeVFSMethodHandle *)handle; - + return GNOME_VFS_OK; }
- Previous message: [maemo-commits] r14012 - projects/haf/trunk/osso-gnome-vfs2/debian
- Next message: [maemo-commits] r14014 - projects/haf/trunk/osso-gnome-vfs2/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]