use G_GNUC_NULL_TERMINATED.

	* libsoup/soup-connection.h (soup_connection_new):
	* libsoup/soup-server.h (soup_server_new):
	* libsoup/soup-session-async.h (soup_session_async_new_with_options):
	* libsoup/soup-session-sync.h (soup_session_sync_new_with_options):
	* libsoup/soup-socket.h (soup_socket_new): use G_GNUC_NULL_TERMINATED.

	* libsoup/soup-types.h (G_GNUC_NULL_TERMINATED): steal the
	definition of this from glib 2.8 for use when compiling against
	glib 2.6.

diff --git a/ChangeLog b/ChangeLog
index 0adc637..32fc105 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-15  Dan Winship  <danw@novell.com>
+
+       * libsoup/soup-connection.h (soup_connection_new):
+       * libsoup/soup-server.h (soup_server_new):
+       * libsoup/soup-session-async.h (soup_session_async_new_with_options): 
+       * libsoup/soup-session-sync.h (soup_session_sync_new_with_options): 
+       * libsoup/soup-socket.h (soup_socket_new): use G_GNUC_NULL_TERMINATED.
+
+       * libsoup/soup-types.h (G_GNUC_NULL_TERMINATED): steal the
+       definition of this from glib 2.8 for use when compiling against
+       glib 2.6.
+
 2005-08-15  Tambet Ingo  <tambet@ximian.com>
 
        * libsoup/soup-socket.c (update_fdflags, set_property): Fix compilation

diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h
index ca6f5d1..0c191b9 100644 (file)
--- a/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h
@@ -62,7 +62,7 @@ typedef void  (*SoupConnectionCallback)        (SoupConnection   *conn,
 #define SOUP_CONNECTION_MESSAGE_FILTER  "message-filter"
 
 SoupConnection *soup_connection_new            (const char       *propname1,
-                                               ...);
+                                               ...) G_GNUC_NULL_TERMINATED;
 
 void            soup_connection_connect_async  (SoupConnection   *conn,
                                                SoupConnectionCallback callback,

diff --git a/libsoup/soup-server.h b/libsoup/soup-server.h
index 1fe83a5..40f7fad 100644 (file)
--- a/libsoup/soup-server.h
+++ b/libsoup/soup-server.h
@@ -66,7 +66,7 @@ struct SoupServerHandler {
 #define SOUP_SERVER_SSL_KEY_FILE  "ssl-key-file"
 
 SoupServer        *soup_server_new            (const char            *optname1,
-                                              ...);
+                                              ...) G_GNUC_NULL_TERMINATED;
 
 SoupProtocol       soup_server_get_protocol   (SoupServer            *serv);
 guint              soup_server_get_port       (SoupServer            *serv);

diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index 2423809..3986865 100644 (file)
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -30,7 +30,7 @@ GType soup_session_async_get_type (void);
 
 SoupSession *soup_session_async_new              (void);
 SoupSession *soup_session_async_new_with_options (const char *optname1,
-                                                 ...);
+                                                 ...) G_GNUC_NULL_TERMINATED;
 
 
 #endif /* SOUP_SESSION_ASYNC_H */

diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index b775de0..d7d4d82 100644 (file)
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -30,7 +30,7 @@ GType soup_session_sync_get_type (void);
 
 SoupSession *soup_session_sync_new              (void);
 SoupSession *soup_session_sync_new_with_options (const char *optname1,
-                                                ...);
+                                                ...) G_GNUC_NULL_TERMINATED;
 
 
 #endif /* SOUP_SESSION_SYNC_H */

diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index 5f9f9a1..ba7ccae 100644 (file)
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -67,7 +67,7 @@ typedef void (*SoupSocketListenerCallback)    (SoupSocket         *listener,
 GType soup_socket_get_type (void);
 
 SoupSocket    *soup_socket_new                (const char         *optname1,
-                                              ...);
+                                              ...) G_GNUC_NULL_TERMINATED;
 
 guint          soup_socket_connect            (SoupSocket         *sock,
                                               SoupAddress        *remote_addr);

diff --git a/libsoup/soup-types.h b/libsoup/soup-types.h
index ecd7282..1370583 100644 (file)
--- a/libsoup/soup-types.h
+++ b/libsoup/soup-types.h
@@ -49,4 +49,13 @@ GType type_name##_get_type(void)\
        return type;                                    \
 }
 
+/* Compat for glib 2.6.x */
+#ifndef G_GNUC_NULL_TERMINATED
+#  if __GNUC__ >= 4
+#  define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#  else
+#  define G_GNUC_NULL_TERMINATED
+#  endif
+#endif
+
 #endif