2003-11-18 Dan Winship <danw@ximian.com>
+ * libsoup/Makefile.am (INCLUDES): Change G_LOG_DOMAIN to
+ "libsoup". Remove unused defines.
+
+ * libsoup/soup-connection.c: Fix doc comments
+ * libsoup/soup-message.c: Likewise
+ * libsoup/soup-misc.c: Likewise
+ * libsoup/soup-socket.c: Likewise
+ * libsoup/soup-uri.c: Likewise
+
+ * libsoup/soup-address.h: Fixes to please gtk-doc
+ * libsoup/soup-connection.h: Likewise
+ * libsoup/soup-message.h: Likewise
+ * libsoup/soup-message-private.h: Likewise
+ * libsoup/soup-misc.h: Likewise
+ * libsoup/soup-server-auth.h: Likewise
+ * libsoup/soup-socket.h: Likewise
+
+2003-11-18 Dan Winship <danw@ximian.com>
+
* configure.in: Fix up the SSL checks some. Remove some useless
old header checks.
## Process this file with automake to produce Makefile.in
INCLUDES = \
- -DG_LOG_DOMAIN=\"SOUP\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DG_LOG_DOMAIN=\"libsoup\" \
-I$(top_srcdir) \
$(SOUP_DEBUG_FLAGS) \
$(GLIB_CFLAGS) \
void (*dns_result) (SoupAddress *addr, guint status);
} SoupAddressClass;
+/* This is messy, but gtk-doc doesn't understand if the #if occurs
+ * inside the typedef.
+ */
+#ifdef AF_INET6
typedef enum {
SOUP_ADDRESS_FAMILY_IPV4 = AF_INET,
-#ifdef AF_INET6
SOUP_ADDRESS_FAMILY_IPV6 = AF_INET6
+} SoupAddressFamily;
#else
+typedef enum {
+ SOUP_ADDRESS_FAMILY_IPV4 = AF_INET,
SOUP_ADDRESS_FAMILY_IPV6 = -1
-#endif
} SoupAddressFamily;
+#endif
#define SOUP_ADDRESS_ANY_PORT 0
guint status,
gpointer data);
void soup_address_resolve_async (SoupAddress *addr,
- SoupAddressCallback cb,
- gpointer data);
+ SoupAddressCallback callback,
+ gpointer user_data);
guint soup_address_resolve_sync (SoupAddress *addr);
const char *soup_address_get_name (SoupAddress *addr);
/**
* soup_connection_connect_async:
* @conn: the connection
- * @ac: the async context to use
* @callback: callback to call when the connection succeeds or fails
* @user_data: data for @callback
*
gpointer data);
void soup_connection_connect_async (SoupConnection *conn,
- SoupConnectionCallback,
+ SoupConnectionCallback callback,
gpointer user_data);
guint soup_connection_connect_sync (SoupConnection *conn);
void soup_message_cleanup (SoupMessage *req);
void soup_message_cleanup_response (SoupMessage *req);
-gboolean soup_message_is_keepalive (SoupMessage *msg);
-
typedef void (*SoupMessageGetHeadersFn) (SoupMessage *msg,
GString *headers,
* soup_message_set_response:
* @msg: the message
* @content_type: MIME Content-Type of the body
- * @req_owner: the #SoupOwnership of the passed data buffer.
- * @req_body: a data buffer containing the body of the message response.
- * @req_length: the byte length of @req_body.
+ * @resp_owner: the #SoupOwnership of the passed data buffer.
+ * @resp_body: a data buffer containing the body of the message response.
+ * @resp_length: the byte length of @resp_body.
*
* Convenience function to set the response body of a #SoupMessage
*/
SOUP_MESSAGE_STATUS_QUEUED,
SOUP_MESSAGE_STATUS_CONNECTING,
SOUP_MESSAGE_STATUS_RUNNING,
- SOUP_MESSAGE_STATUS_FINISHED,
+ SOUP_MESSAGE_STATUS_FINISHED
} SoupMessageStatus;
#define SOUP_MESSAGE_IS_STARTING(msg) (msg->status == SOUP_MESSAGE_STATUS_QUEUED || msg->status == SOUP_MESSAGE_STATUS_CONNECTING)
typedef enum {
SOUP_TRANSFER_UNKNOWN = 0,
SOUP_TRANSFER_CHUNKED,
- SOUP_TRANSFER_CONTENT_LENGTH,
+ SOUP_TRANSFER_CONTENT_LENGTH
} SoupTransferEncoding;
typedef enum {
typedef void (*SoupMessageCallbackFn) (SoupMessage *req, gpointer user_data);
SoupMessage *soup_message_new (const char *method,
- const char *uri);
+ const char *uri_string);
SoupMessage *soup_message_new_from_uri (const char *method,
const SoupUri *uri);
const char *content_type,
SoupOwnership req_owner,
char *req_body,
- gulong req_len);
+ gulong req_length);
void soup_message_set_response (SoupMessage *msg,
const char *content_type,
SoupOwnership resp_owner,
char *resp_body,
- gulong resp_len);
+ gulong resp_length);
-void soup_message_cancel (SoupMessage *req);
+void soup_message_cancel (SoupMessage *msg);
void soup_message_add_header (GHashTable *hash,
const char *name,
typedef enum {
SOUP_HTTP_1_0 = 0,
- SOUP_HTTP_1_1 = 1,
+ SOUP_HTTP_1_1 = 1
} SoupHttpVersion;
void soup_message_set_http_version (SoupMessage *msg,
/**
* soup_base64_encode:
* @text: the binary data to encode.
- * @inlen: the length of @text.
+ * @len: the length of @text.
*
* Encode a sequence of binary data into it's Base-64 stringified
* representation.
* Return value: The Base-64 encoded string representing @text.
*/
char *
-soup_base64_encode (const char *text, int inlen)
+soup_base64_encode (const char *text, int len)
{
unsigned char *out;
int state = 0, outlen;
/* Misc utils */
guint soup_signal_connect_once (gpointer instance,
- const char *signal,
+ const char *detailed_signal,
GCallback c_handler,
gpointer data);
typedef enum {
SOUP_AUTH_TYPE_BASIC = 1,
- SOUP_AUTH_TYPE_DIGEST,
+ SOUP_AUTH_TYPE_DIGEST
} SoupAuthType;
typedef struct {
/**
* soup_socket_new:
+ * @optname1: name of first property to set (or %NULL)
+ * @...: value of @optname1, followed by additional property/value pairs
*
* Return value: a new (disconnected) socket
**/
/**
* soup_socket_start_ssl:
- * @socket: the socket
+ * @sock: the socket
*
* Starts using SSL on @socket.
*
* @sock: the socket
* @buffer: data to write
* @len: size of @buffer, in bytes
- * @nwrite: on return, number of bytes written
+ * @nwrote: on return, number of bytes written
*
* Attempts to write @len bytes from @buffer to @sock. If some data is
* successfully written, the resturn status will be
...);
guint soup_socket_connect (SoupSocket *sock,
- SoupAddress *rem_addr);
+ SoupAddress *remote_addr);
gboolean soup_socket_listen (SoupSocket *sock,
SoupAddress *local_addr);
gboolean soup_socket_start_ssl (SoupSocket *sock);
SoupSocket *soup_socket_client_new_sync (const char *hostname,
guint port,
gpointer ssl_creds,
- guint *status);
+ guint *status_ret);
SoupSocket *soup_socket_server_new (SoupAddress *local_addr,
gpointer ssl_creds,
- SoupSocketListenerCallback,
+ SoupSocketListenerCallback callback,
gpointer user_data);
SoupAddress *soup_socket_get_local_address (SoupSocket *sock);
*
* This %-encodes the given URI part and returns the escaped version
* in allocated memory, which the caller must free when it is done.
+ *
+ * Return value: the encoded URI part
**/
char *
soup_uri_encode (const char *part, const char *escape_extra)