diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-06-02 07:09:19 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-02 07:09:19 +0800 |
| commit | 8771a6de3590d468d1a2c3cfab34955c624f614a (patch) | |
| tree | dc23ed6ab0533bc9f241976f33b6c6cc2d7ee117 /addressbook/gui/component/addressbook-migrate.c | |
| parent | 69a1e923a71ee881721e21b991de08b897f9e7b0 (diff) | |
| download | gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.gz gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.zst gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.zip | |
More code cleanup.
Diffstat (limited to 'addressbook/gui/component/addressbook-migrate.c')
| -rw-r--r-- | addressbook/gui/component/addressbook-migrate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 8ba997cd3e..c4272742cc 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -142,7 +142,7 @@ dialog_set_progress (MigrationContext *context, double percent) { gchar text[5]; - snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); + snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f)); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), percent); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (context->progress), text); @@ -186,7 +186,7 @@ get_source_name (ESourceGroup *group, const gchar *path) gboolean conflict; GString *s = g_string_new (""); - for (i = 0; p[i]; i ++) ; + for (i = 0; p[i]; i ++); num_elements = i; i--; @@ -586,7 +586,7 @@ get_string_child (xmlNode *node, return retval; } -static int +static gint get_integer_child (xmlNode *node, const gchar *name, gint defval) @@ -779,7 +779,7 @@ migrate_completion_folders (MigrationContext *context) if the physical_uri is anything else, we strip off the args - (anything after ;) before searching + (anything after;) before searching for the uri. */ if (!strncmp (physical_uri, "file://", 7)) { @@ -1018,9 +1018,9 @@ migrate_pilot_data (const gchar *old_path, const gchar *new_path) ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db")))) { /* src and dest file formats are identical for both map and changelog files */ guchar inbuf[4096]; - size_t nread, nwritten; + gsize nread, nwritten; gint fd0, fd1; - ssize_t n; + gssize n; filename = g_build_filename (old_path, dent, NULL); if ((fd0 = g_open (filename, O_RDONLY | O_BINARY, 0)) == -1) { |