Switch on warnings about prototypes, and fix them

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49725
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Mikhail Zabaluev <mikhail.zabaluev@nokia.com>

11 files changed, 19 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 0795eed..afce653 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,13 +60,12 @@ TP_COMPILER_WARNINGS([ERROR_CFLAGS], [test "x$enable_fatal_warnings" = xyes],
    missing-prototypes \
    nested-externs \
    pointer-arith \
+   strict-prototypes \
    format-security \
    init-self],
   dnl missing-prototypes, sign-compare and strict-prototypes are bugs really
   [missing-field-initializers \
-   missing-prototypes \
    sign-compare \
-   strict-prototypes \
    unused-parameter])
 AC_SUBST([ERROR_CFLAGS])
 
diff --git a/rakia/Makefile.am b/rakia/Makefile.am
index 0bd3247..645e6ae 100644
--- a/rakia/Makefile.am
+++ b/rakia/Makefile.am
@@ -67,7 +67,8 @@ CLEANFILES = $(BUILT_SOURCES)
 CLEANFILES += *.gcno
 
 signals-marshal.c: ${srcdir}/signals-marshal.list
-	glib-genmarshal --body --prefix=_rakia_marshal $< >$@ || rm -f $@
+	( echo '#include "signals-marshal.h"' && \
+	glib-genmarshal --body --prefix=_rakia_marshal $< ) >$@ || rm -f $@
 
 signals-marshal.h: ${srcdir}/signals-marshal.list
 	glib-genmarshal --header --prefix=_rakia_marshal $< >$@ || rm -f $@
diff --git a/rakia/base-connection.c b/rakia/base-connection.c
index d8fda06..1c68f02 100644
--- a/rakia/base-connection.c
+++ b/rakia/base-connection.c
@@ -93,7 +93,7 @@ rakia_base_connection_dispose(GObject *object)
   G_OBJECT_CLASS(rakia_base_connection_parent_class)->dispose(object);
 }
 
-void
+static void
 rakia_base_connection_finalize(GObject *object)
 {
   G_OBJECT_CLASS(rakia_base_connection_parent_class)->finalize(object);
diff --git a/rakia/codec-param-formats.c b/rakia/codec-param-formats.c
index c73aed1..929b1a8 100644
--- a/rakia/codec-param-formats.c
+++ b/rakia/codec-param-formats.c
@@ -81,7 +81,7 @@ static GRegex *dtmf_events_regex = NULL;
 
 static GHashTable *codec_param_formats[NUM_TP_MEDIA_STREAM_TYPES];
 
-static void rakia_codec_param_formats_init ();
+static void rakia_codec_param_formats_init (void);
 
 
 static void rakia_codec_param_format_generic (RakiaSipCodec *codec,
@@ -302,7 +302,7 @@ rakia_codec_param_parse_generic (const gchar *fmtp, TpMediaStreamType media_type
                " as an attribute-value list: %s", &fmtp[pos]);
 }
 
-RakiaSipCodecParam *
+static RakiaSipCodecParam *
 find_param_by_name (RakiaSipCodec *codec, const gchar *name)
 {
   guint i;
@@ -380,7 +380,7 @@ rakia_codec_param_parse_telephone_event (const gchar *fmtp,
  * Calling the function more than once has no effect.
  */
 static void
-rakia_codec_param_formats_init ()
+rakia_codec_param_formats_init (void)
 {
   static volatile gsize been_here = 0;
 
diff --git a/rakia/debug.c b/rakia/debug.c
index f82f975..84f2993 100644
--- a/rakia/debug.c
+++ b/rakia/debug.c
@@ -47,7 +47,8 @@ static GString *sofia_log_buf = NULL;
 static void rakia_sofia_log_close (void);
 
 
-void rakia_debug_set_flags_from_env ()
+void
+rakia_debug_set_flags_from_env (void)
 {
   const gchar *flags_string;
 
diff --git a/rakia/debug.h b/rakia/debug.h
index 3e62739..db92e7b 100644
--- a/rakia/debug.h
+++ b/rakia/debug.h
@@ -37,7 +37,7 @@ typedef enum
   RAKIA_DEBUG_CALL          = 1 << 6,
 } RakiaDebugFlags;
 
-void rakia_debug_set_flags_from_env ();
+void rakia_debug_set_flags_from_env (void);
 void rakia_debug_set_flags (RakiaDebugFlags flags);
 gboolean rakia_debug_flag_is_set (RakiaDebugFlags flag);
 void rakia_log (RakiaDebugFlags flag, GLogLevelFlags level,
diff --git a/rakia/event-target.c b/rakia/event-target.c
index 6b36119..02647e1 100644
--- a/rakia/event-target.c
+++ b/rakia/event-target.c
@@ -37,7 +37,7 @@ enum {
 };
 static guint signals[NUM_SIGNALS] = {0};
 
-static RakiaEventTarget * rakia_event_target_gone_instance ();
+static RakiaEventTarget * rakia_event_target_gone_instance (void);
 
 static void
 rakia_event_target_base_init (gpointer klass)
@@ -213,6 +213,8 @@ rakia_event_target_emit_nua_event (gpointer             instance,
 typedef struct _RakiaEventTargetGone RakiaEventTargetGone;
 typedef struct _RakiaEventTargetGoneClass RakiaEventTargetGoneClass;
 
+static GType rakia_event_target_gone_get_type (void);
+
 struct _RakiaEventTargetGone {
   GObject parent;
 };
@@ -264,7 +266,7 @@ _rakia_event_target_gone_new_instance (gpointer foo)
 }
 
 static RakiaEventTarget *
-rakia_event_target_gone_instance ()
+rakia_event_target_gone_instance (void)
 {
   static GOnce init_gone_once = G_ONCE_INIT;
 
diff --git a/rakia/handles.c b/rakia/handles.c
index 7fa7e99..7819131 100644
--- a/rakia/handles.c
+++ b/rakia/handles.c
@@ -29,7 +29,7 @@
 #include "rakia/debug.h"
 
 static GQuark
-rakia_handle_url_quark ()
+rakia_handle_url_quark (void)
 {
   static GQuark quark = 0;
 
diff --git a/rakia/sip-session.h b/rakia/sip-session.h
index d3f330b..51b72c0 100644
--- a/rakia/sip-session.h
+++ b/rakia/sip-session.h
@@ -137,6 +137,8 @@ gint rakia_sip_session_rate_native_transport (RakiaSipSession *session,
 void rakia_sip_session_set_hold_requested (RakiaSipSession *session,
     gboolean hold_requested);
 
+gboolean rakia_sip_session_is_held (RakiaSipSession *session);
+
 G_END_DECLS
 
 #endif /* #ifndef __RAKIA_SIP_SESSION_H__*/
diff --git a/rakia/util.h b/rakia/util.h
index 8d1ce0d..e36bebf 100644
--- a/rakia/util.h
+++ b/rakia/util.h
@@ -31,7 +31,7 @@ gchar * rakia_unquote_string (const gchar *src, gssize len);
 
 void rakia_string_append_quoted (GString *buf, const gchar *text);
 
-gchar const *rakia_version_string ();
+gchar const *rakia_version_string (void);
 
 G_END_DECLS
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b1db877..4522715 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,7 @@ noinst_LTLIBRARIES = librakia-convenience.la
 
 %-enumtypes.c: %.h
 	glib-mkenums \
-	--fhead "#include <$*.h>" \
+	--fhead "#include <$*-enumtypes.h>\n#include <$*.h>" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
 	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
 	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \