Here's a bunch of cleanups for warnings from the Intel compiler. Please
comment and I'll try to fix up any issues.
Cheers
Kjartan
? compile
? gnome-vfs-zip
? warnings
? warnings-icc
? warnings-icc-fixed
? imported/fnmatch/Makefile
? imported/fnmatch/Makefile.in
? imported/neon/Makefile
? imported/neon/Makefile.in
? po/stamp-it
? test/test-address
? test/test-parse-ls-lga
Index: daemon/gnome-vfs-async-daemon.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/daemon/gnome-vfs-async-daemon.c,v
retrieving revision 1.7
diff -u -p -r1.7 gnome-vfs-async-daemon.c
--- daemon/gnome-vfs-async-daemon.c 9 Jan 2004 13:25:05 -0000 1.7
+++ daemon/gnome-vfs-async-daemon.c 29 Mar 2006 22:16:56 -0000
@@ -36,7 +36,7 @@ BONOBO_CLASS_BOILERPLATE_FULL(
gnome_vfs_async_daemon,
GNOME_VFS_AsyncDaemon,
BonoboObject,
- BONOBO_TYPE_OBJECT);
+ BONOBO_TYPE_OBJECT)
/* Protects the client_call_context hashtable, and the existance of
Index: daemon/gnome-vfs-daemon-dir-handle.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/daemon/gnome-vfs-daemon-dir-handle.c,v
retrieving revision 1.5
diff -u -p -r1.5 gnome-vfs-daemon-dir-handle.c
--- daemon/gnome-vfs-daemon-dir-handle.c 26 Feb 2004 08:59:37 -0000
1.5
+++ daemon/gnome-vfs-daemon-dir-handle.c 29 Mar 2006 22:16:56 -0000
@@ -35,7 +35,7 @@ BONOBO_CLASS_BOILERPLATE_FULL(
gnome_vfs_daemon_dir_handle,
GNOME_VFS_DaemonDirHandle,
BonoboObject,
- BONOBO_TYPE_OBJECT);
+ BONOBO_TYPE_OBJECT)
static void
Index: daemon/gnome-vfs-daemon-handle.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/daemon/gnome-vfs-daemon-handle.c,v
retrieving revision 1.6
diff -u -p -r1.6 gnome-vfs-daemon-handle.c
--- daemon/gnome-vfs-daemon-handle.c 26 Feb 2004 08:59:37 -0000 1.6
+++ daemon/gnome-vfs-daemon-handle.c 29 Mar 2006 22:16:56 -0000
@@ -33,7 +33,7 @@ BONOBO_CLASS_BOILERPLATE_FULL(
gnome_vfs_daemon_handle,
GNOME_VFS_DaemonHandle,
BonoboObject,
- BONOBO_TYPE_OBJECT);
+ BONOBO_TYPE_OBJECT)
static void
Index: daemon/gnome-vfs-daemon.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/daemon/gnome-vfs-daemon.c,v
retrieving revision 1.14
diff -u -p -r1.14 gnome-vfs-daemon.c
--- daemon/gnome-vfs-daemon.c 18 Jan 2005 19:04:10 -0000 1.14
+++ daemon/gnome-vfs-daemon.c 29 Mar 2006 22:16:56 -0000
@@ -51,7 +51,7 @@ BONOBO_CLASS_BOILERPLATE_FULL(
gnome_vfs_daemon,
GNOME_VFS_Daemon,
BonoboObject,
- BONOBO_TYPE_OBJECT);
+ BONOBO_TYPE_OBJECT)
static void disconnect_client_from_volume_monitor (const
GNOME_VFS_Client client);
Index: libgnomevfs/gnome-vfs-async-ops.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-async-ops.c,v
retrieving revision 1.16
diff -u -p -r1.16 gnome-vfs-async-ops.c
--- libgnomevfs/gnome-vfs-async-ops.c 14 Nov 2005 11:41:13 -0000 1.16
+++ libgnomevfs/gnome-vfs-async-ops.c 29 Mar 2006 22:16:57 -0000
@@ -485,7 +485,6 @@ void gnome_vfs_async_create_ur
{
GnomeVFSJob *job;
GnomeVFSCreateAsChannelOp *create_as_channel_op;
- GnomeVFSAsyncHandle *result;
g_return_if_fail (handle_return != NULL);
g_return_if_fail (uri != NULL);
@@ -502,7 +501,6 @@ void gnome_vfs_async_create_ur
create_as_channel_op->exclusive = exclusive;
create_as_channel_op->perm = perm;
- result = job->job_handle;
_gnome_vfs_job_go (job);
}
Index: libgnomevfs/gnome-vfs-client-call.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-client-call.c,v
retrieving revision 1.3
diff -u -p -r1.3 gnome-vfs-client-call.c
--- libgnomevfs/gnome-vfs-client-call.c 26 Nov 2003 12:18:38 -0000 1.3
+++ libgnomevfs/gnome-vfs-client-call.c 29 Mar 2006 22:16:57 -0000
@@ -13,7 +13,7 @@ BONOBO_CLASS_BOILERPLATE_FULL(
gnome_vfs_client_call,
GNOME_VFS_ClientCall,
BonoboObject,
- BONOBO_TYPE_OBJECT);
+ BONOBO_TYPE_OBJECT)
static GStaticPrivate daemon_client_call_private =
G_STATIC_PRIVATE_INIT;
Index: libgnomevfs/gnome-vfs-client.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-client.c,v
retrieving revision 1.5
diff -u -p -r1.5 gnome-vfs-client.c
--- libgnomevfs/gnome-vfs-client.c 10 Dec 2003 12:00:43 -0000 1.5
+++ libgnomevfs/gnome-vfs-client.c 29 Mar 2006 22:16:57 -0000
@@ -11,7 +11,7 @@ BONOBO_CLASS_BOILERPLATE_FULL(
gnome_vfs_client,
GNOME_VFS_Client,
BonoboObject,
- BONOBO_TYPE_OBJECT);
+ BONOBO_TYPE_OBJECT)
struct _GnomeVFSClientPrivate {
Index: libgnomevfs/gnome-vfs-configuration.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-configuration.c,v
retrieving revision 1.29
diff -u -p -r1.29 gnome-vfs-configuration.c
--- libgnomevfs/gnome-vfs-configuration.c 30 Nov 2005 22:56:02 -0000
1.29
+++ libgnomevfs/gnome-vfs-configuration.c 29 Mar 2006 22:16:57 -0000
@@ -222,7 +222,7 @@ parse_line (Configuration *configuration
string_len = strlen (line_buffer);
if (string_len != line_len) {
- g_warning (_("%s:%d contains NUL characters."),
+ g_warning (_("%s:%u contains NUL characters."),
file_name, line_number);
return FALSE;
}
@@ -239,7 +239,7 @@ parse_line (Configuration *configuration
gchar *method_name;
if (p == method_start) {
- g_warning (_("%s:%d contains no method name."),
+ g_warning (_("%s:%u contains no method name."),
file_name, line_number);
retval = FALSE;
goto cleanup;
@@ -279,7 +279,7 @@ parse_line (Configuration *configuration
}
if (*p == '\0') {
- g_warning (_("%s:%d has no options endmarker."),
+ g_warning (_("%s:%u has no options endmarker."),
file_name, line_number);
retval = FALSE;
goto cleanup;
@@ -290,7 +290,7 @@ parse_line (Configuration *configuration
if (strcmp (option, "daemon") == 0) {
daemon = TRUE;
} else {
- g_warning (_("%s:%d has unknown options
%s."),
+ g_warning (_("%s:%u has unknown options
%s."),
file_name, line_number,
option);
}
g_free (option);
@@ -309,7 +309,7 @@ parse_line (Configuration *configuration
if (*p == '\0') {
if (method_list != NULL) {
- g_warning (_("%s:%d contains no module name."),
+ g_warning (_("%s:%u contains no module name."),
file_name, line_number);
retval = FALSE;
} else {
Index: libgnomevfs/gnome-vfs-daemon-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-daemon-method.c,v
retrieving revision 1.5
diff -u -p -r1.5 gnome-vfs-daemon-method.c
--- libgnomevfs/gnome-vfs-daemon-method.c 13 Apr 2005 19:58:54 -0000
1.5
+++ libgnomevfs/gnome-vfs-daemon-method.c 29 Mar 2006 22:16:57 -0000
@@ -654,7 +654,6 @@ do_get_file_info (GnomeVFSMethod *method
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *uri_str;
GnomeVFSClientCall *client_call;
GNOME_VFS_FileInfo *corba_info;
@@ -671,7 +670,6 @@ do_get_file_info (GnomeVFSMethod *method
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_GetFileInfo (daemon,
uri_str,
&corba_info,
@@ -709,7 +707,6 @@ do_get_file_info_from_handle (GnomeVFSMe
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
GnomeVFSClientCall *client_call;
GNOME_VFS_FileInfo *corba_info;
@@ -717,7 +714,6 @@ do_get_file_info_from_handle (GnomeVFSMe
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_DaemonHandle_GetFileInfo ((GNOME_VFS_DaemonHandle)
method_handle,
&corba_info,
options,
@@ -795,7 +791,6 @@ do_make_directory (GnomeVFSMethod *metho
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *uri_str;
GnomeVFSClientCall *client_call;
@@ -811,7 +806,6 @@ do_make_directory (GnomeVFSMethod *metho
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_MakeDirectory (daemon,
uri_str,
perm,
@@ -841,7 +835,6 @@ do_remove_directory (GnomeVFSMethod *met
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *uri_str;
GnomeVFSClientCall *client_call;
@@ -857,7 +850,6 @@ do_remove_directory (GnomeVFSMethod *met
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_RemoveDirectory (daemon,
uri_str,
BONOBO_OBJREF
(client_call),
@@ -888,7 +880,6 @@ do_move (GnomeVFSMethod *method,
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *old_uri_str;
char *new_uri_str;
GnomeVFSClientCall *client_call;
@@ -906,7 +897,6 @@ do_move (GnomeVFSMethod *method,
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_Move (daemon,
old_uri_str,
new_uri_str,
@@ -938,7 +928,6 @@ do_unlink (GnomeVFSMethod *method,
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *uri_str;
GnomeVFSClientCall *client_call;
@@ -954,7 +943,6 @@ do_unlink (GnomeVFSMethod *method,
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_Unlink (daemon,
uri_str,
BONOBO_OBJREF (client_call),
@@ -985,7 +973,6 @@ do_check_same_fs (GnomeVFSMethod *method
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *source_uri_str;
char *target_uri_str;
GnomeVFSClientCall *client_call;
@@ -1004,7 +991,6 @@ do_check_same_fs (GnomeVFSMethod *method
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_CheckSameFS (daemon,
source_uri_str,
target_uri_str,
@@ -1039,7 +1025,6 @@ do_set_file_info (GnomeVFSMethod *method
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *uri_str;
GnomeVFSClientCall *client_call;
GNOME_VFS_FileInfo *corba_info;
@@ -1059,7 +1044,6 @@ do_set_file_info (GnomeVFSMethod *method
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_SetFileInfo (daemon,
uri_str,
corba_info,
@@ -1087,7 +1071,6 @@ do_truncate (GnomeVFSMethod *method,
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *uri_str;
GnomeVFSClientCall *client_call;
@@ -1103,7 +1086,6 @@ do_truncate (GnomeVFSMethod *method,
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_Truncate (daemon,
uri_str,
where,
@@ -1138,7 +1120,6 @@ do_find_directory (GnomeVFSMethod *metho
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *near_uri_str;
char *result_uri_str;
GnomeVFSClientCall *client_call;
@@ -1155,7 +1136,6 @@ do_find_directory (GnomeVFSMethod *metho
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_FindDirectory (daemon,
near_uri_str,
kind,
@@ -1196,7 +1176,6 @@ do_create_symbolic_link (GnomeVFSMethod
GnomeVFSClient *client;
GnomeVFSResult res;
CORBA_Environment ev;
- GNOME_VFS_DaemonHandle handle;
char *uri_str;
GnomeVFSClientCall *client_call;
@@ -1212,7 +1191,6 @@ do_create_symbolic_link (GnomeVFSMethod
client_call = _gnome_vfs_client_call_get (context);
CORBA_exception_init (&ev);
- handle = CORBA_OBJECT_NIL;
res = GNOME_VFS_AsyncDaemon_CreateSymbolicLink (daemon,
uri_str,
target_reference,
Index: libgnomevfs/gnome-vfs-hal-mounts.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c,v
retrieving revision 1.29
diff -u -p -r1.29 gnome-vfs-hal-mounts.c
--- libgnomevfs/gnome-vfs-hal-mounts.c 20 Mar 2006 16:52:56 -0000 1.29
+++ libgnomevfs/gnome-vfs-hal-mounts.c 29 Mar 2006 22:16:57 -0000
@@ -130,7 +130,7 @@ typedef struct {
} HalIconPair;
/* by design, the enums are laid out so we can do easy computations */
-static HalIconPair hal_icon_mapping[] = {
+static const HalIconPair hal_icon_mapping[] = {
{HAL_ICON_DRIVE_REMOVABLE_DISK, "gnome-dev-removable"},
{HAL_ICON_DRIVE_REMOVABLE_DISK_IDE, "gnome-dev-removable"},
{HAL_ICON_DRIVE_REMOVABLE_DISK_SCSI, "gnome-dev-removable"},
@@ -618,8 +618,10 @@ static gboolean
_hal_volume_policy_check (GnomeVFSVolumeMonitorDaemon
*volume_monitor_daemon,
LibHalDrive *hal_drive, LibHalVolume *hal_volume)
{
+#if 0
const char *label;
const char *fstype;
+#endif
gboolean ret;
const char *fhs23_toplevel_mount_points[] = {
"/",
@@ -692,16 +694,14 @@ _hal_volume_policy_check (GnomeVFSVolume
}
}
}
-
+#if 0
label = libhal_volume_get_label (hal_volume);
fstype = libhal_volume_get_fstype (hal_volume);
/* blacklist partitions with name 'bootstrap' of type HFS (Apple uses
that) */
-/*
if (label != NULL && fstype != NULL && strcmp (label, "bootstrap") ==
0 && strcmp (fstype, "hfs") == 0)
goto out;
-*/
-
+#endif
ret = TRUE;
out:
return ret;
@@ -791,7 +791,6 @@ _hal_add_drive_without_volumes (GnomeVFS
{
GnomeVFSDrive *drive;
GnomeVFSVolumeMonitor *volume_monitor;
- GnomeVFSHalUserData *hal_userdata;
char *name;
g_return_if_fail (hal_drive != NULL);
@@ -802,7 +801,6 @@ _hal_add_drive_without_volumes (GnomeVFS
#endif
volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_daemon);
- hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data
(volume_monitor_daemon->hal_ctx);
if (!_hal_drive_policy_check (volume_monitor_daemon, hal_drive, NULL))
{
/* make sure to delete the drive/volume for policy changes */
@@ -861,7 +859,6 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
GnomeVFSVolume *vol;
GnomeVFSDrive *drive;
GnomeVFSVolumeMonitor *volume_monitor;
- GnomeVFSHalUserData *hal_userdata;
char *name;
gboolean allowed_by_policy;
const char *backing_udi;
@@ -873,7 +870,6 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
backing_udi = NULL;
volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_daemon);
- hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data
(volume_monitor_daemon->hal_ctx);
allowed_by_policy = _hal_volume_policy_check (volume_monitor_daemon,
hal_drive, hal_volume);
@@ -1473,9 +1469,6 @@ void
_gnome_vfs_hal_mounts_shutdown (GnomeVFSVolumeMonitorDaemon
*volume_monitor_daemon)
{
DBusError error;
- GnomeVFSHalUserData *hal_userdata;
-
- hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data
(volume_monitor_daemon->hal_ctx);
dbus_error_init (&error);
if (!libhal_ctx_shutdown (volume_monitor_daemon->hal_ctx, &error)) {
Index: libgnomevfs/gnome-vfs-job.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-job.c,v
retrieving revision 1.106
diff -u -p -r1.106 gnome-vfs-job.c
--- libgnomevfs/gnome-vfs-job.c 2 Dec 2005 18:25:17 -0000 1.106
+++ libgnomevfs/gnome-vfs-job.c 29 Mar 2006 22:16:58 -0000
@@ -47,7 +47,7 @@ static GStaticPrivate job_private = G_ST
#if GNOME_VFS_JOB_DEBUG
-char *job_debug_types[] = {
+const char *job_debug_types[] = {
"open", "open as channel",
"create", "create symbolic link",
"create as channel", "close",
@@ -1199,11 +1199,8 @@ execute_create_as_channel (GnomeVFSJob *
static void
execute_close (GnomeVFSJob *job)
{
- GnomeVFSCloseOp *close_op;
GnomeVFSNotifyResult *notify_result;
- close_op = &job->op->specifics.close;
-
notify_result = g_new0 (GnomeVFSNotifyResult, 1);
notify_result->job_handle = job->job_handle;
notify_result->type = job->op->type;
@@ -1519,10 +1516,6 @@ load_directory_details (GnomeVFSJob *job
static void
execute_load_directory (GnomeVFSJob *job)
{
- GnomeVFSLoadDirectoryOp *load_directory_op;
-
- load_directory_op = &job->op->specifics.load_directory;
-
load_directory_details (job);
}
Index: libgnomevfs/gnome-vfs-mime-handlers.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-mime-handlers.c,v
retrieving revision 1.127
diff -u -p -r1.127 gnome-vfs-mime-handlers.c
--- libgnomevfs/gnome-vfs-mime-handlers.c 6 Feb 2006 10:55:55 -0000
1.127
+++ libgnomevfs/gnome-vfs-mime-handlers.c 29 Mar 2006 22:16:58 -0000
@@ -771,7 +771,6 @@ gnome_vfs_mime_id_in_component_list (con
return g_list_find_custom
(components, (gpointer) iid,
(GCompareFunc) gnome_vfs_mime_component_matches_id) != NULL;
- return FALSE;
}
/**
Index: libgnomevfs/gnome-vfs-mime-info.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-mime-info.c,v
retrieving revision 1.91
diff -u -p -r1.91 gnome-vfs-mime-info.c
--- libgnomevfs/gnome-vfs-mime-info.c 14 Nov 2005 11:41:13 -0000 1.91
+++ libgnomevfs/gnome-vfs-mime-info.c 29 Mar 2006 22:16:58 -0000
@@ -134,8 +134,9 @@ gnome_vfs_mime_init (void)
xdg_data_dirs++) {
add_data_dir (*xdg_data_dirs);
}
-
+#if 0
last_checked = time (NULL);
+#endif
gnome_vfs_mime_inited = TRUE;
}
@@ -317,12 +318,9 @@ handle_mime_info (const char *filename,
{
MimeEntry *entry;
int ret;
- int depth;
int previous_lang_level = INT_MAX;
entry = g_new0 (MimeEntry, 1);
-
- depth = xmlTextReaderDepth (reader);
ret = xmlTextReaderRead (reader);
while (ret == 1) {
Index: libgnomevfs/gnome-vfs-mime-magic.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-mime-magic.c,v
retrieving revision 1.50
diff -u -p -r1.50 gnome-vfs-mime-magic.c
--- libgnomevfs/gnome-vfs-mime-magic.c 13 Apr 2005 19:58:54 -0000 1.50
+++ libgnomevfs/gnome-vfs-mime-magic.c 29 Mar 2006 22:16:58 -0000
@@ -129,12 +129,12 @@ _gnome_vfs_sniff_buffer_looks_like_text
return FALSE;
}
-static int bitrates[2][15] = {
+static const int bitrates[2][15] = {
{ 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320},
{ 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160 }
};
-static int frequencies[2][3] = {
+static const int frequencies[2][3] = {
{ 44100, 48000, 32000 },
{ 22050, 24000, 16000 }
};
Index: libgnomevfs/gnome-vfs-module-callback-marshall.c
===================================================================
RCS
file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-module-callback-marshall.c,v
retrieving revision 1.5
diff -u -p -r1.5 gnome-vfs-module-callback-marshall.c
--- libgnomevfs/gnome-vfs-module-callback-marshall.c 20 Apr 2004
13:27:46 -0000 1.5
+++ libgnomevfs/gnome-vfs-module-callback-marshall.c 29 Mar 2006
22:16:58 -0000
@@ -91,7 +91,6 @@ auth_demarshal_in (const CORBA_any *any_
{
GNOME_VFS_ModuleCallbackAuthenticationIn *corba_in;
GnomeVFSModuleCallbackAuthenticationIn *auth_in;
- GnomeVFSModuleCallbackAuthenticationOut *auth_out;
if (!CORBA_TypeCode_equal (any_in->_type,
TC_GNOME_VFS_ModuleCallbackAuthenticationIn, NULL)) {
return FALSE;
@@ -99,7 +98,7 @@ auth_demarshal_in (const CORBA_any *any_
auth_in = *in = g_new0 (GnomeVFSModuleCallbackAuthenticationIn, 1);
*in_size = sizeof (GnomeVFSModuleCallbackAuthenticationIn);
- auth_out = *out = g_new0 (GnomeVFSModuleCallbackAuthenticationOut, 1);
+ *out = g_new0 (GnomeVFSModuleCallbackAuthenticationOut, 1);
*out_size = sizeof (GnomeVFSModuleCallbackAuthenticationOut);
corba_in = (GNOME_VFS_ModuleCallbackAuthenticationIn *)any_in->_value;
@@ -220,7 +219,6 @@ full_auth_demarshal_in (const CORBA_any
{
GNOME_VFS_ModuleCallbackFullAuthenticationIn *corba_in;
GnomeVFSModuleCallbackFullAuthenticationIn *auth_in;
- GnomeVFSModuleCallbackFullAuthenticationOut *auth_out;
if (!CORBA_TypeCode_equal (any_in->_type,
TC_GNOME_VFS_ModuleCallbackFullAuthenticationIn, NULL)) {
return FALSE;
@@ -228,7 +226,7 @@ full_auth_demarshal_in (const CORBA_any
auth_in = *in = g_new0 (GnomeVFSModuleCallbackFullAuthenticationIn,
1);
*in_size = sizeof (GnomeVFSModuleCallbackFullAuthenticationIn);
- auth_out = *out = g_new0 (GnomeVFSModuleCallbackFullAuthenticationOut,
1);
+ *out = g_new0 (GnomeVFSModuleCallbackFullAuthenticationOut, 1);
*out_size = sizeof (GnomeVFSModuleCallbackFullAuthenticationOut);
corba_in = (GNOME_VFS_ModuleCallbackFullAuthenticationIn
*)any_in->_value;
@@ -370,7 +368,6 @@ fill_auth_demarshal_in (const CORBA_any
{
GNOME_VFS_ModuleCallbackFillAuthenticationIn *corba_in;
GnomeVFSModuleCallbackFillAuthenticationIn *auth_in;
- GnomeVFSModuleCallbackFillAuthenticationOut *auth_out;
if (!CORBA_TypeCode_equal (any_in->_type,
TC_GNOME_VFS_ModuleCallbackFillAuthenticationIn, NULL)) {
return FALSE;
@@ -378,7 +375,7 @@ fill_auth_demarshal_in (const CORBA_any
auth_in = *in = g_new0 (GnomeVFSModuleCallbackFillAuthenticationIn,
1);
*in_size = sizeof (GnomeVFSModuleCallbackFillAuthenticationIn);
- auth_out = *out = g_new0 (GnomeVFSModuleCallbackFillAuthenticationOut,
1);
+ *out = g_new0 (GnomeVFSModuleCallbackFillAuthenticationOut, 1);
*out_size = sizeof (GnomeVFSModuleCallbackFillAuthenticationOut);
corba_in = (GNOME_VFS_ModuleCallbackFillAuthenticationIn
*)any_in->_value;
@@ -510,7 +507,6 @@ save_auth_demarshal_in (const CORBA_any
{
GNOME_VFS_ModuleCallbackSaveAuthenticationIn *corba_in;
GnomeVFSModuleCallbackSaveAuthenticationIn *auth_in;
- GnomeVFSModuleCallbackSaveAuthenticationOut *auth_out;
if (!CORBA_TypeCode_equal (any_in->_type,
TC_GNOME_VFS_ModuleCallbackSaveAuthenticationIn, NULL)) {
return FALSE;
@@ -518,7 +514,7 @@ save_auth_demarshal_in (const CORBA_any
auth_in = *in = g_new0 (GnomeVFSModuleCallbackSaveAuthenticationIn,
1);
*in_size = sizeof (GnomeVFSModuleCallbackSaveAuthenticationIn);
- auth_out = *out = g_new0 (GnomeVFSModuleCallbackSaveAuthenticationOut,
1);
+ *out = g_new0 (GnomeVFSModuleCallbackSaveAuthenticationOut, 1);
*out_size = sizeof (GnomeVFSModuleCallbackSaveAuthenticationOut);
corba_in = (GNOME_VFS_ModuleCallbackSaveAuthenticationIn
*)any_in->_value;
@@ -541,18 +537,14 @@ static CORBA_any *
save_auth_marshal_out (gconstpointer out, gsize out_size)
{
CORBA_any *retval;
- GNOME_VFS_ModuleCallbackSaveAuthenticationOut *ret_out;
- const GnomeVFSModuleCallbackSaveAuthenticationOut *auth_out;
if (out_size != sizeof (GnomeVFSModuleCallbackSaveAuthenticationOut))
{
return NULL;
}
- auth_out = out;
retval = CORBA_any_alloc ();
retval->_type = TC_GNOME_VFS_ModuleCallbackSaveAuthenticationOut;
retval->_value = GNOME_VFS_ModuleCallbackSaveAuthenticationOut__alloc
();
- ret_out = retval->_value;
return retval;
}
@@ -560,16 +552,10 @@ save_auth_marshal_out (gconstpointer out
static gboolean
save_auth_demarshal_out (CORBA_any *any_out, gpointer out, gsize
out_size)
{
- GNOME_VFS_ModuleCallbackSaveAuthenticationOut *corba_out;
- GnomeVFSModuleCallbackSaveAuthenticationOut *auth_out;
-
if (!CORBA_TypeCode_equal (any_out->_type,
TC_GNOME_VFS_ModuleCallbackSaveAuthenticationOut, NULL) ||
out_size != sizeof (GnomeVFSModuleCallbackSaveAuthenticationOut))
{
return FALSE;
}
- auth_out = out;
-
- corba_out = (GNOME_VFS_ModuleCallbackSaveAuthenticationOut
*)any_out->_value;
return TRUE;
}
@@ -647,7 +633,6 @@ question_demarshal_in (const CORBA_any *
{
GNOME_VFS_ModuleCallbackQuestionIn *corba_in;
GnomeVFSModuleCallbackQuestionIn *question_in;
- GnomeVFSModuleCallbackQuestionOut *question_out;
int cnt;
if (!CORBA_TypeCode_equal (any_in->_type,
TC_GNOME_VFS_ModuleCallbackQuestionIn, NULL)) {
@@ -656,7 +641,7 @@ question_demarshal_in (const CORBA_any *
question_in = *in = g_new0 (GnomeVFSModuleCallbackQuestionIn, 1);
*in_size = sizeof (GnomeVFSModuleCallbackQuestionIn);
- question_out = *out = g_new0 (GnomeVFSModuleCallbackQuestionOut, 1);
+ *out = g_new0 (GnomeVFSModuleCallbackQuestionOut, 1);
*out_size = sizeof (GnomeVFSModuleCallbackQuestionOut);
corba_in = (GNOME_VFS_ModuleCallbackQuestionIn *)any_in->_value;
Index: libgnomevfs/gnome-vfs-uri.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-uri.c,v
retrieving revision 1.133
diff -u -p -r1.133 gnome-vfs-uri.c
--- libgnomevfs/gnome-vfs-uri.c 27 Feb 2006 10:25:39 -0000 1.133
+++ libgnomevfs/gnome-vfs-uri.c 29 Mar 2006 22:16:58 -0000
@@ -1236,9 +1236,9 @@ gnome_vfs_uri_to_string (const GnomeVFSU
if (top_level_uri->host_port > 0
&& (hide_options & GNOME_VFS_URI_HIDE_HOST_PORT) == 0) {
- gchar tmp[128];
- sprintf (tmp, ":%d", top_level_uri->host_port);
- g_string_append (string, tmp);
+ gchar temp[128];
+ sprintf (temp, ":%u", top_level_uri->host_port);
+ g_string_append (string, temp);
}
}
Index: libgnomevfs/gnome-vfs-xfer.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-xfer.c,v
retrieving revision 1.136
diff -u -p -r1.136 gnome-vfs-xfer.c
--- libgnomevfs/gnome-vfs-xfer.c 20 Mar 2006 12:16:54 -0000 1.136
+++ libgnomevfs/gnome-vfs-xfer.c 29 Mar 2006 22:16:58 -0000
@@ -866,11 +866,10 @@ handle_merged_name_conflict_visit (const
GnomeVFSFileInfo *source_info;
GnomeVFSFileInfo *target_info;
GnomeVFSResult result;
- gboolean replace, skip;
+ gboolean skip;
params = data;
- replace = FALSE;
skip = FALSE;
result = GNOME_VFS_OK;
target_info = gnome_vfs_file_info_new ();
Index: modules/cdda-cddb.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/cdda-cddb.c,v
retrieving revision 1.13
diff -u -p -r1.13 cdda-cddb.c
--- modules/cdda-cddb.c 23 Jul 2005 23:09:27 -0000 1.13
+++ modules/cdda-cddb.c 29 Mar 2006 22:16:58 -0000
@@ -68,7 +68,7 @@ static void CDDBProcessLine(char *inbuf
static void CDDBWriteLine(char *header,int num,char *data,FILE
*outfile);
#endif
-static char *cddb_genres[] = {"unknown","blues","classical","country",
+static const char *cddb_genres[] =
{"unknown","blues","classical","country",
"data","folk","jazz","misc","newage",
"reggae","rock","soundtrack"};
Index: modules/file-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/file-method.c,v
retrieving revision 1.155
diff -u -p -r1.155 file-method.c
--- modules/file-method.c 28 Feb 2006 10:08:18 -0000 1.155
+++ modules/file-method.c 29 Mar 2006 22:16:58 -0000
@@ -774,7 +774,6 @@ get_stat_info (GnomeVFSFileInfo *file_in
struct stat *statptr)
{
struct stat statbuf;
- gboolean followed_symlink;
#ifndef G_OS_WIN32
gboolean is_symlink;
char *link_file_path;
@@ -784,8 +783,6 @@ get_stat_info (GnomeVFSFileInfo *file_in
#endif
gboolean recursive;
- followed_symlink = FALSE;
-
recursive = FALSE;
GNOME_VFS_FILE_INFO_SET_LOCAL (file_info, TRUE);
@@ -816,7 +813,6 @@ get_stat_info (GnomeVFSFileInfo *file_in
}
}
GNOME_VFS_FILE_INFO_SET_SYMLINK (file_info, TRUE);
- followed_symlink = TRUE;
}
#endif
gnome_vfs_stat_to_file_info (file_info, statptr);
@@ -1862,9 +1858,6 @@ do_find_directory (GnomeVFSMethod *metho
/* This volume does not contain our home, we have to
find/create the
Trash
* elsewhere on the volume. Use a heuristic to find a
good place.
*/
- FindByDeviceIDParameters tmp;
- tmp.device_id = near_item_stat.st_dev;
-
if (gnome_vfs_context_check_cancellation (context))
return GNOME_VFS_ERROR_CANCELLED;
Index: modules/ftp-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/ftp-method.c,v
retrieving revision 1.123
diff -u -p -r1.123 ftp-method.c
--- modules/ftp-method.c 20 Mar 2006 19:33:35 -0000 1.123
+++ modules/ftp-method.c 29 Mar 2006 22:16:59 -0000
@@ -283,7 +283,7 @@ ftp_response_to_vfs_result (FtpConnectio
}
#ifdef HAVE_GSSAPI
-static char *radixN =
+static const char *radixN =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static char pad = '=';
@@ -1005,9 +1005,7 @@ ftp_kerberos_login (FtpConnection *conn,
char *encoded_token;
int len;
GnomeVFSResult result;
- gboolean auth_ok;
- auth_ok = FALSE;
result = do_basic_command (conn, "AUTH GSSAPI", cancellation);
if (result != GNOME_VFS_OK) {
return result;
Index: modules/http-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/http-method.c,v
retrieving revision 1.165
diff -u -p -r1.165 http-method.c
--- modules/http-method.c 24 Jul 2004 10:55:02 -0000 1.165
+++ modules/http-method.c 29 Mar 2006 22:16:59 -0000
@@ -562,7 +562,7 @@ struct _Header {
};
typedef struct _Header Header;
-static Header headers[] = {
+static const Header headers[] = {
{ "Content-Length", set_content_length },
{ "Content-Type", set_content_type },
{ "Last-Modified", set_last_modified },
Index: modules/http-neon-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/http-neon-method.c,v
retrieving revision 1.35
diff -u -p -r1.35 http-neon-method.c
--- modules/http-neon-method.c 14 Feb 2006 06:22:37 -0000 1.35
+++ modules/http-neon-method.c 29 Mar 2006 22:16:59 -0000
@@ -291,7 +291,7 @@ typedef struct {
} MethodSchemes;
-static MethodSchemes supported_schemes[] = {
+static const MethodSchemes supported_schemes[] = {
{"http", FALSE, "http", FALSE},
{"dav", FALSE, "http", TRUE},
@@ -988,11 +988,11 @@ typedef enum {
} HttpMethods;
-struct HttpMethod {
+static struct HttpMethod {
char *string;
HttpMethods type;
-} http_all_methods [] = {
+} const http_all_methods [] = {
{"OPTIONS", ALLOW_OPTIONS},
{"GET", ALLOW_GET},
{"HEAD", ALLOW_HEAD},
Index: modules/nntp-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/nntp-method.c,v
retrieving revision 1.9
diff -u -p -r1.9 nntp-method.c
--- modules/nntp-method.c 9 Dec 2005 14:21:35 -0000 1.9
+++ modules/nntp-method.c 29 Mar 2006 22:16:59 -0000
@@ -1689,7 +1689,6 @@ static void
remove_file_from_list (gpointer key, gpointer value, gpointer
callback_data)
{
GList *element_list;
- nntp_file* file;
GList** file_list_ptr;
file_list_ptr = (GList**) callback_data;
@@ -1698,7 +1697,6 @@ remove_file_from_list (gpointer key, gpo
/* if there is more than one element in the list, remove all of them
from the file list */
if (element_list != NULL && g_list_length(element_list) > 1) {
while (element_list != NULL) {
- file = (nntp_file*) element_list->data;
*file_list_ptr = g_list_remove(*file_list_ptr,
element_list->data);
element_list = element_list->next;
}
@@ -2056,7 +2054,6 @@ do_open_directory (GnomeVFSMethod *metho
GnomeVFSFileInfoOptions options,
GnomeVFSContext *context)
{
- const char *newsgroup_server;
char *newsgroup_name;
char *directory_name, *mapped_dirname;
@@ -2065,7 +2062,6 @@ do_open_directory (GnomeVFSMethod *metho
nntp_file *file;
GList *file_list;
- newsgroup_server = gnome_vfs_uri_get_host_name (uri);
newsgroup_name = gnome_vfs_uri_extract_dirname (uri);
directory_name = g_strdup (gnome_vfs_uri_extract_short_name (uri));
Index: modules/sftp-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/sftp-method.c,v
retrieving revision 1.42
diff -u -p -r1.42 sftp-method.c
--- modules/sftp-method.c 20 Mar 2006 17:47:35 -0000 1.42
+++ modules/sftp-method.c 29 Mar 2006 22:17:00 -0000
@@ -190,9 +190,7 @@ atomic_io (read_write_fn f, gint fd, gpo
while (__result == -1L && errno == EINTR);
res = __result;
- if (res < 0)
- return -1;
- else if (res == 0)
+ if (res == 0)
return pos;
buffer += res;
Index: modules/smb-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/smb-method.c,v
retrieving revision 1.36
diff -u -p -r1.36 smb-method.c
--- modules/smb-method.c 28 Feb 2006 12:27:35 -0000 1.36
+++ modules/smb-method.c 29 Mar 2006 22:17:00 -0000
@@ -422,10 +422,8 @@ remove_server (gpointer key,
gpointer user_data)
{
SmbServerCacheEntry *entry;
- SMBCSRV *server;
entry = key;
- server = user_data;
if (entry->server == user_data) {
entry->server = NULL;
Index: monikers/bonobo-storage-fs.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/monikers/bonobo-storage-fs.c,v
retrieving revision 1.51
diff -u -p -r1.51 bonobo-storage-fs.c
--- monikers/bonobo-storage-fs.c 14 Apr 2005 18:48:30 -0000 1.51
+++ monikers/bonobo-storage-fs.c 29 Mar 2006 22:17:00 -0000
@@ -454,7 +454,7 @@ bonobo_storage_fs_init (GObject *object)
BONOBO_TYPE_FUNC_FULL (BonoboStorageFS,
Bonobo_Storage,
bonobo_object_get_type (),
- bonobo_storage_fs);
+ bonobo_storage_fs)
/**
* bonobo_storage_fs_open:
Index: monikers/bonobo-storage-vfs.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/monikers/bonobo-storage-vfs.c,v
retrieving revision 1.20
diff -u -p -r1.20 bonobo-storage-vfs.c
--- monikers/bonobo-storage-vfs.c 10 Feb 2003 18:01:46 -0000 1.20
+++ monikers/bonobo-storage-vfs.c 29 Mar 2006 22:17:00 -0000
@@ -345,4 +345,4 @@ bonobo_storage_vfs_init (GObject *object
BONOBO_TYPE_FUNC_FULL (BonoboStorageVfs,
Bonobo_Storage,
bonobo_object_get_type (),
- bonobo_storage_vfs);
+ bonobo_storage_vfs)
Index: monikers/gnome-moniker-std.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/monikers/gnome-moniker-std.c,v
retrieving revision 1.12
diff -u -p -r1.12 gnome-moniker-std.c
--- monikers/gnome-moniker-std.c 28 Jul 2001 21:16:39 -0000 1.12
+++ monikers/gnome-moniker-std.c 29 Mar 2006 22:17:00 -0000
@@ -36,6 +36,6 @@ bonobo_std_moniker_factory (BonoboGeneri
BONOBO_OAF_SHLIB_FACTORY_MULTI ("OAFIID:GNOME_VFS_Moniker_std_Factory",
"bonobo standard moniker",
bonobo_std_moniker_factory,
- NULL);
+ NULL)
Index: test/test-long-cancel.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/test/test-long-cancel.c,v
retrieving revision 1.2
diff -u -p -r1.2 test-long-cancel.c
--- test/test-long-cancel.c 1 Mar 2006 13:02:26 -0000 1.2
+++ test/test-long-cancel.c 29 Mar 2006 22:17:00 -0000
@@ -96,7 +96,7 @@ create_master_socket (int *port)
return s;
}
-int client_fd = -1;
+static int client_fd = -1;
static gboolean
new_client (GIOChannel *channel,
Index: test/test-mime-info-cache.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/test/test-mime-info-cache.c,v
retrieving revision 1.5
diff -u -p -r1.5 test-mime-info-cache.c
--- test/test-mime-info-cache.c 14 Apr 2005 18:48:31 -0000 1.5
+++ test/test-mime-info-cache.c 29 Mar 2006 22:17:00 -0000
@@ -4,16 +4,16 @@
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-mime-monitor.h>
-void mime_cache_info_reload (void);
+static void mime_cache_info_reload (void);
-gpointer foo (const char *mime_type);
+static gpointer foo (const char *mime_type);
-void mime_cache_info_reload (void)
+static void mime_cache_info_reload (void)
{
g_print ("mime cache reloaded...\n");
}
-gpointer foo (const char *mime_type) {
+static gpointer foo (const char *mime_type) {
GList *desktop_file_apps, *tmp;
while (1) {
@@ -33,8 +33,6 @@ gpointer foo (const char *mime_type) {
}
g_usleep (1000000);
}
-
- return NULL;
}
int main (int argc, char **argv)
Index: test/test-seek.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/test/test-seek.c,v
retrieving revision 1.4
diff -u -p -r1.4 test-seek.c
--- test/test-seek.c 3 Aug 2001 19:04:43 -0000 1.4
+++ test/test-seek.c 29 Mar 2006 22:17:00 -0000
@@ -231,6 +231,7 @@ main (int argc, char **argv)
result = gnome_vfs_close (handle);
show_result (result, "gnome_vfs_close", argv[1]);
+ fclose (ref);
return 0;
}
Index: test/test-symlinks.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/test/test-symlinks.c,v
retrieving revision 1.11
diff -u -p -r1.11 test-symlinks.c
--- test/test-symlinks.c 13 Apr 2005 19:58:56 -0000 1.11
+++ test/test-symlinks.c 29 Mar 2006 22:17:00 -0000
@@ -260,11 +260,6 @@ main (int argc, const char **argv)
{
GnomeVFSURI *directory, *file_to_delete;
- poptContext popt_context;
-
- popt_context = poptGetContext ("test-vfs", argc, argv,
- options, 0);
-
if (argc != 2) {
fprintf (stderr, "Usage: %s <directory>\n", argv[0]);
return 1;
_______________________________________________
gnome-vfs-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list
