aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-11-05 18:28:27 +0800
committerXan Lopez <xan@igalia.com>2012-11-05 18:31:58 +0800
commit1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6 (patch)
tree2995abcb8dc23b2ddee8a68faa7edbc9c9dfe610
parent303bf9e2b4b68b84c1a79c3c04b810682f34c7f3 (diff)
downloadgsoc2013-epiphany-1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6.tar
gsoc2013-epiphany-1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6.tar.gz
gsoc2013-epiphany-1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6.tar.bz2
gsoc2013-epiphany-1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6.tar.lz
gsoc2013-epiphany-1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6.tar.xz
gsoc2013-epiphany-1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6.tar.zst
gsoc2013-epiphany-1fd2fe9efbdc3bb26786b8efecf5f8b60e430ac6.zip
Fix a ton of 'warning: function declaration isn’t a prototype'
New warning flags have been added to gnome-common recently, and we were getting this a lot. Turns out in C 'foo ()' is not the same than 'foo (void)'; the first just means that no information is given about the number of arguments, the second means the function has exactly zero arguments, so add the 'void' thing all over the place when needed.
-rw-r--r--embed/ephy-about-handler.c2
-rw-r--r--embed/uri-tester.c2
-rw-r--r--lib/ephy-profile-migrator.c20
-rw-r--r--lib/ephy-sqlite-connection.c2
-rw-r--r--lib/ephy-web-app-utils.c4
-rw-r--r--src/pdm-dialog.c6
-rw-r--r--tests/ephy-bookmarks-test.c8
-rw-r--r--tests/ephy-completion-model-test.c4
-rw-r--r--tests/ephy-embed-single-test.c6
-rw-r--r--tests/ephy-encodings-test.c4
-rw-r--r--tests/ephy-file-helpers-test.c14
-rw-r--r--tests/ephy-history-test.c4
-rw-r--r--tests/ephy-session-test.c6
-rw-r--r--tests/ephy-shell-test.c12
-rw-r--r--tests/ephy-string-test.c2
-rw-r--r--tests/ephy-web-app-utils-test.c2
-rw-r--r--tests/ephy-web-view-test.c10
17 files changed, 54 insertions, 54 deletions
diff --git a/embed/ephy-about-handler.c b/embed/ephy-about-handler.c
index 12f0ad71e..9f4caf665 100644
--- a/embed/ephy-about-handler.c
+++ b/embed/ephy-about-handler.c
@@ -36,7 +36,7 @@
static gchar *css_style = NULL;
static void
-read_css_style ()
+read_css_style (void)
{
GError *error = NULL;
const gchar *file;
diff --git a/embed/uri-tester.c b/embed/uri-tester.c
index f997cd7c4..e71990252 100644
--- a/embed/uri-tester.c
+++ b/embed/uri-tester.c
@@ -75,7 +75,7 @@ static gboolean
uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri);
static char *
-uri_tester_ensure_data_dir ()
+uri_tester_ensure_data_dir (void)
{
char *folder = NULL;
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index 2f915e315..c7cf49415 100644
--- a/lib/ephy-profile-migrator.c
+++ b/lib/ephy-profile-migrator.c
@@ -64,13 +64,13 @@ static char *profile_dir = NULL;
typedef void (*EphyProfileMigrator) (void);
static gboolean
-profile_dir_exists ()
+profile_dir_exists (void)
{
return g_file_test (ephy_dot_dir (), G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
}
static void
-migrate_cookies ()
+migrate_cookies (void)
{
const char *cookies_file_sqlite = "cookies.sqlite";
const char *cookies_file_txt = "cookies.txt";
@@ -335,7 +335,7 @@ parse_and_decrypt_signons (const char *signons,
#endif
static void
-migrate_passwords ()
+migrate_passwords (void)
{
#ifdef ENABLE_NSS
char *dest, *contents, *gecko_passwords_backup;
@@ -383,7 +383,7 @@ migrate_passwords ()
}
static void
-migrate_passwords2 ()
+migrate_passwords2 (void)
{
#ifdef ENABLE_NSS
char *dest, *contents;
@@ -549,7 +549,7 @@ static GMarkupParser history_parse_funcs =
};
static void
-migrate_history ()
+migrate_history (void)
{
GFileInputStream *input;
GMarkupParseContext *context;
@@ -620,7 +620,7 @@ migrate_history ()
}
static void
-migrate_tabs_visibility ()
+migrate_tabs_visibility (void)
{
gboolean always_show_tabs;
@@ -670,7 +670,7 @@ migrate_profile (const char *old_dir,
}
static void
-migrate_profile_gnome2_to_xdg ()
+migrate_profile_gnome2_to_xdg (void)
{
char *old_dir;
char *new_dir;
@@ -723,7 +723,7 @@ fix_desktop_file_and_return_new_location (const char *dir)
}
static void
-migrate_web_app_links ()
+migrate_web_app_links (void)
{
GList *apps, *p;
@@ -773,7 +773,7 @@ migrate_web_app_links ()
}
static void
-migrate_new_urls_table ()
+migrate_new_urls_table (void)
{
EphySQLiteConnection *history_database;
char *filename;
@@ -831,7 +831,7 @@ const EphyProfileMigrator migrators[] = {
};
static gboolean
-ephy_migrator ()
+ephy_migrator (void)
{
int latest, i;
EphyProfileMigrator m;
diff --git a/lib/ephy-sqlite-connection.c b/lib/ephy-sqlite-connection.c
index 655d6c28e..0c49bf684 100644
--- a/lib/ephy-sqlite-connection.c
+++ b/lib/ephy-sqlite-connection.c
@@ -51,7 +51,7 @@ ephy_sqlite_connection_init (EphySQLiteConnection *self)
self->priv->database = NULL;
}
-static GQuark get_ephy_sqlite_quark ()
+static GQuark get_ephy_sqlite_quark (void)
{
return g_quark_from_static_string ("ephy-sqlite");
}
diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
index c686f95e8..1bd1a2f8d 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -258,7 +258,7 @@ out:
}
#ifdef HAVE_WEBKIT2
-static SoupCookieJar *get_current_cookie_jar ()
+static SoupCookieJar *get_current_cookie_jar (void)
{
char *filename;
SoupCookieJar *jar;
@@ -274,7 +274,7 @@ static SoupCookieJar *get_current_cookie_jar ()
return jar;
}
#else
-static SoupCookieJar *get_current_cookie_jar ()
+static SoupCookieJar *get_current_cookie_jar (void)
{
SoupSession *session = webkit_get_default_session ();
SoupCookieJar *jar;
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 3cb8d6af5..0bc61973d 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -171,7 +171,7 @@ typedef struct
#ifdef HAVE_WEBKIT2
static WebKitCookieManager *
-get_cookie_manager ()
+get_cookie_manager (void)
{
WebKitWebContext *web_context;
@@ -180,7 +180,7 @@ get_cookie_manager ()
}
#else
static SoupCookieJar*
-get_cookie_jar ()
+get_cookie_jar (void)
{
SoupSession* session;
@@ -243,7 +243,7 @@ got_network_passwords_list_cb (GnomeKeyringResult result,
}
static void
-_ephy_pdm_delete_all_passwords ()
+_ephy_pdm_delete_all_passwords (void)
{
gnome_keyring_list_item_ids (GNOME_KEYRING_DEFAULT,
got_network_passwords_list_cb,
diff --git a/tests/ephy-bookmarks-test.c b/tests/ephy-bookmarks-test.c
index 03bdcf07f..ca1f780fe 100644
--- a/tests/ephy-bookmarks-test.c
+++ b/tests/ephy-bookmarks-test.c
@@ -27,7 +27,7 @@
const char* bookmarks_paths[] = { "ephy-bookmarks.xml", "bookmarks.rdf", NULL };
static void
-clear_bookmark_files ()
+clear_bookmark_files (void)
{
GFile *file;
char *path;
@@ -46,7 +46,7 @@ clear_bookmark_files ()
}
static void
-test_ephy_bookmarks_create ()
+test_ephy_bookmarks_create (void)
{
EphyBookmarks *bookmarks;
@@ -58,7 +58,7 @@ test_ephy_bookmarks_create ()
}
static void
-test_ephy_bookmarks_add ()
+test_ephy_bookmarks_add (void)
{
EphyBookmarks *bookmarks;
EphyNode *node, *result;
@@ -77,7 +77,7 @@ test_ephy_bookmarks_add ()
}
static void
-test_ephy_bookmarks_set_address ()
+test_ephy_bookmarks_set_address (void)
{
EphyBookmarks *bookmarks;
EphyNode *node;
diff --git a/tests/ephy-completion-model-test.c b/tests/ephy-completion-model-test.c
index d02377d5f..b20ecb5f2 100644
--- a/tests/ephy-completion-model-test.c
+++ b/tests/ephy-completion-model-test.c
@@ -28,7 +28,7 @@
#include "ephy-shell.h"
static void
-test_ephy_completion_model_create ()
+test_ephy_completion_model_create (void)
{
EphyCompletionModel *model;
model = ephy_completion_model_new ();
@@ -51,7 +51,7 @@ update_empty_cb (EphyHistoryService *service,
}
static void
-test_ephy_completion_model_update_empty ()
+test_ephy_completion_model_update_empty (void)
{
EphyCompletionModel *model;
GMainLoop *loop = NULL;
diff --git a/tests/ephy-embed-single-test.c b/tests/ephy-embed-single-test.c
index e9e5c0a70..0bd9a3047 100644
--- a/tests/ephy-embed-single-test.c
+++ b/tests/ephy-embed-single-test.c
@@ -32,7 +32,7 @@
#include <gtk/gtk.h>
static void
-test_embed_single_new ()
+test_embed_single_new (void)
{
EphyEmbedSingle *single;
@@ -43,7 +43,7 @@ test_embed_single_new ()
}
static void
-test_embed_single_get_from_shell ()
+test_embed_single_get_from_shell (void)
{
EphyEmbedSingle *single;
@@ -52,7 +52,7 @@ test_embed_single_get_from_shell ()
}
static void
-test_embed_single_form_auth ()
+test_embed_single_form_auth (void)
{
EphyEmbedSingle *single;
GSList *results = NULL;
diff --git a/tests/ephy-encodings-test.c b/tests/ephy-encodings-test.c
index 209aeb3cb..fa743dd51 100644
--- a/tests/ephy-encodings-test.c
+++ b/tests/ephy-encodings-test.c
@@ -33,7 +33,7 @@
#define NUM_ENCODINGS 78
static void
-test_ephy_encodings_create ()
+test_ephy_encodings_create (void)
{
EphyEncoding *encoding;
@@ -50,7 +50,7 @@ test_ephy_encodings_create ()
}
static void
-test_ephy_encodings_get ()
+test_ephy_encodings_get (void)
{
EphyEncodings *encodings;
GList *all, *p;
diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
index 6830eab0b..dcb6cc539 100644
--- a/tests/ephy-file-helpers-test.c
+++ b/tests/ephy-file-helpers-test.c
@@ -42,7 +42,7 @@ static const FileInitTest private_tests[] =
};
static void
-test_ephy_file_helpers_init ()
+test_ephy_file_helpers_init (void)
{
int i;
@@ -124,7 +124,7 @@ static const DownloadsDirTest downloads_tests[] =
};
static void
-test_ephy_file_get_downloads_dir ()
+test_ephy_file_get_downloads_dir (void)
{
int i;
@@ -177,7 +177,7 @@ static const DirTest dir_tests[] =
};
static void
-test_ephy_file_create_delete_dir ()
+test_ephy_file_create_delete_dir (void)
{
int i;
@@ -209,7 +209,7 @@ test_ephy_file_create_delete_dir ()
}
static void
-test_ephy_file_desktop_dir ()
+test_ephy_file_desktop_dir (void)
{
char *desktop_dir;
const char *xdg_desktop;
@@ -226,7 +226,7 @@ test_ephy_file_desktop_dir ()
}
static void
-test_ephy_file_create_delete_tmp ()
+test_ephy_file_create_delete_tmp (void)
{
char *tmp_file = NULL;
char *tmp_path = NULL;
@@ -291,7 +291,7 @@ test_ephy_file_create_delete_tmp ()
}
static void
-test_ephy_file_switch_temp_file ()
+test_ephy_file_switch_temp_file (void)
{
char *tmp_file;
@@ -372,7 +372,7 @@ static const SanitizeFilenameTest sanitize_filename_tests[] =
};
static void
-test_ephy_sanitize_filename ()
+test_ephy_sanitize_filename (void)
{
guint i;
diff --git a/tests/ephy-history-test.c b/tests/ephy-history-test.c
index 63b4a0dd7..9e10b08fe 100644
--- a/tests/ephy-history-test.c
+++ b/tests/ephy-history-test.c
@@ -93,7 +93,7 @@ test_create_history_entry (void)
}
static GList *
-create_test_page_visit_list ()
+create_test_page_visit_list (void)
{
GList *visits = NULL;
int i;
@@ -463,7 +463,7 @@ perform_query_after_clear (EphyHistoryService *service,
}
static void
-test_clear ()
+test_clear (void)
{
gchar *temporary_file = g_build_filename (g_get_tmp_dir (), "epiphany-history-test.db", NULL);
EphyHistoryService *service = ensure_empty_history (temporary_file);
diff --git a/tests/ephy-session-test.c b/tests/ephy-session-test.c
index 4a070aa49..b07eacc8e 100644
--- a/tests/ephy-session-test.c
+++ b/tests/ephy-session-test.c
@@ -42,7 +42,7 @@ const char *session_data =
"</session>";
static void
-test_ephy_session_load ()
+test_ephy_session_load (void)
{
EphySession *session;
gboolean ret;
@@ -77,7 +77,7 @@ const char *session_data_empty =
"";
static void
-test_ephy_session_load_empty_session ()
+test_ephy_session_load_empty_session (void)
{
EphySession *session;
gboolean ret;
@@ -127,7 +127,7 @@ const char *session_data_many_windows =
"</session>";
static void
-test_ephy_session_load_many_windows ()
+test_ephy_session_load_many_windows (void)
{
EphySession *session;
gboolean ret;
diff --git a/tests/ephy-shell-test.c b/tests/ephy-shell-test.c
index 4518cb2c2..1f4a65a22 100644
--- a/tests/ephy-shell-test.c
+++ b/tests/ephy-shell-test.c
@@ -38,7 +38,7 @@
#include <gtk/gtk.h>
static void
-test_ephy_shell_basic_embeds ()
+test_ephy_shell_basic_embeds (void)
{
GtkWidget *window;
@@ -87,7 +87,7 @@ test_ephy_shell_basic_embeds ()
}
static void
-test_ephy_shell_parent_windows ()
+test_ephy_shell_parent_windows (void)
{
GtkWidget *window;
GtkWidget *window2;
@@ -132,7 +132,7 @@ test_ephy_shell_parent_windows ()
}
static void
-test_ephy_shell_tab_load ()
+test_ephy_shell_tab_load (void)
{
GtkWidget *window;
EphyEmbed *embed;
@@ -172,7 +172,7 @@ get_notebook_page_num (GtkWidget *notebook, EphyEmbed *embed)
}
static void
-test_ephy_shell_tab_append ()
+test_ephy_shell_tab_append (void)
{
GtkWidget *window;
GtkWidget *notebook;
@@ -220,7 +220,7 @@ test_ephy_shell_tab_append ()
}
static void
-test_ephy_shell_tab_from_external ()
+test_ephy_shell_tab_from_external (void)
{
GtkWidget *window;
GtkWidget *notebook;
@@ -283,7 +283,7 @@ test_ephy_shell_tab_from_external ()
}
static void
-test_ephy_shell_tab_no_history ()
+test_ephy_shell_tab_no_history (void)
{
GtkWidget *window;
diff --git a/tests/ephy-string-test.c b/tests/ephy-string-test.c
index df3972e90..6d407b003 100644
--- a/tests/ephy-string-test.c
+++ b/tests/ephy-string-test.c
@@ -40,7 +40,7 @@ static const HostnameTest hostname_tests[] = {
};
static void
-test_ephy_string_get_hostname ()
+test_ephy_string_get_hostname (void)
{
int i;
diff --git a/tests/ephy-web-app-utils-test.c b/tests/ephy-web-app-utils-test.c
index db65244d8..25ee59cf0 100644
--- a/tests/ephy-web-app-utils-test.c
+++ b/tests/ephy-web-app-utils-test.c
@@ -52,7 +52,7 @@ static const WebAppTest test_web_app[] = {
};
static void
-test_web_app_lifetime ()
+test_web_app_lifetime (void)
{
int i;
diff --git a/tests/ephy-web-view-test.c b/tests/ephy-web-view-test.c
index 294a8657c..d00189087 100644
--- a/tests/ephy-web-view-test.c
+++ b/tests/ephy-web-view-test.c
@@ -161,7 +161,7 @@ static const URLTest test_load_url[] = {
/* Tests that EphyWebView is successfully loading the given URL. */
static void
-test_ephy_web_view_load_url ()
+test_ephy_web_view_load_url (void)
{
int i;
@@ -234,7 +234,7 @@ static const RegexTest test_non_search_regex[] = {
};
static void
-test_ephy_web_view_non_search_regex ()
+test_ephy_web_view_non_search_regex (void)
{
GRegex *regex_non_search, *regex_domain;
GError *error = NULL;
@@ -296,7 +296,7 @@ static struct {
};
static void
-test_ephy_web_view_normalize_or_autosearch ()
+test_ephy_web_view_normalize_or_autosearch (void)
{
int i;
EphyWebView *view;
@@ -345,7 +345,7 @@ quit_main_loop_when_load_finished (WebKitWebView *view, GParamSpec *spec, GMainL
#endif
static void
-test_ephy_web_view_provisional_load_failure_updates_back_forward_list ()
+test_ephy_web_view_provisional_load_failure_updates_back_forward_list (void)
{
GMainLoop *loop;
EphyWebView *view;
@@ -401,7 +401,7 @@ visit_url_cb (EphyHistoryService *service,
}
static void
-test_ephy_web_view_error_pages_not_stored_in_history ()
+test_ephy_web_view_error_pages_not_stored_in_history (void)
{
GMainLoop *loop;
EphyWebView *view;