diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2011-03-17 19:01:17 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2011-03-17 19:01:17 +0100 |
| commit | 08120de3bdf768ed6d1a935ce05b64f9ddecadc0 (patch) | |
| tree | bff58f236ff267fe21c377f488f11ea08544c0c9 /metadata | |
| parent | cdc5849ea5067573a278c7d5f1a21c14c5b0686a (diff) | |
| download | gvfs-08120de3bdf768ed6d1a935ce05b64f9ddecadc0.tar.gz | |
Cleanups and fixes for compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=641856
Diffstat (limited to 'metadata')
| -rw-r--r-- | metadata/metatree.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/metadata/metatree.c b/metadata/metatree.c index 3a1c12b1..e9797b76 100644 --- a/metadata/metatree.c +++ b/metadata/metatree.c @@ -50,7 +50,6 @@ #include "metabuilder.h" #include <glib.h> #include <glib/gstdio.h> -#include <errno.h> #include "crc32.h" #ifdef HAVE_LIBUDEV @@ -592,9 +591,7 @@ meta_tree_lookup_by_name (const char *name, MetaTree * meta_tree_ref (MetaTree *tree) { - gint old_val; - - old_val = g_atomic_int_exchange_and_add ((int *)&tree->ref_count, 1); + g_atomic_int_exchange_and_add ((int *)&tree->ref_count, 1); return tree; } @@ -1444,7 +1441,7 @@ meta_journal_reverse_map_path_and_key (MetaJournal *journal, guint64 *mtime, gpointer *value) { - PathKeyData data = {0}; + PathKeyData data = {NULL}; char *res_path; data.key = key; @@ -1699,7 +1696,7 @@ get_child_info (EnumDirData *data, char *name; slash = strchr (remainder, '/'); - if (slash != 0) + if (slash != NULL) name = g_strndup (remainder, slash - remainder); else name = g_strdup (remainder); @@ -2762,7 +2759,7 @@ struct _MetaLookupCache { #ifdef HAVE_LIBUDEV -struct udev *udev; +static struct udev *udev; G_LOCK_DEFINE_STATIC (udev); static char * @@ -3084,7 +3081,7 @@ find_mountpoint_for (MetaLookupCache *cache, { char *first_dir, *dir, *last; const char *prefix; - dev_t dir_dev; + dev_t dir_dev = 0; first_dir = get_dirname (file); if (first_dir == NULL) @@ -3105,8 +3102,7 @@ find_mountpoint_for (MetaLookupCache *cache, { if (dir) dir_dev = get_devnum (dir); - if (dir == NULL || - dev != dir_dev) + if (dir == NULL || dev != dir_dev) { g_free (dir); cache->last_parent_mountpoint = last; |