GNOME.org
 

[evolution-data-server] Coding style and whitespace cleanup.

commit 9d0bd0f19f7639fd83739fcba1cbc51f9b38ce3e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Aug 13 22:36:00 2010 -0400

    Coding style and whitespace cleanup.

 camel/camel-mime-utils.c                           |   22 ++++++++++----------
 camel/camel-tcp-stream-raw.c                       |   18 ++++++++--------
 camel/camel-tcp-stream-ssl.c                       |    2 +-
 camel/camel-tcp-stream.c                           |    2 +-
 camel/camel-tcp-stream.h                           |    4 +-
 camel/providers/imap/camel-imap-store.c            |    2 +-
 camel/providers/nntp/camel-nntp-store.c            |    2 +-
 camel/providers/pop3/camel-pop3-store.c            |    2 +-
 camel/providers/smtp/camel-smtp-transport.c        |    2 +-
 .../reference/camel/tmpl/camel-cipher-context.sgml |    2 +
 .../reference/camel/tmpl/camel-tcp-stream-ssl.sgml |   11 +---------
 docs/reference/camel/tmpl/camel-tcp-stream.sgml    |    2 +
 docs/reference/camel/tmpl/camel-unused.sgml        |    8 +++++++
 13 files changed, 41 insertions(+), 38 deletions(-)
---
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index a1c95e0..e2ba2c6 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -196,7 +196,7 @@ camel_uuencode_step (guchar *in, gsize len, guchar *out, guchar *uubuf, gint *st
 		bufptr = uubuf + ((uulen / 3) * 4);
 	} else {
 		bufptr = outptr + 1;
-		
+
 		if (uulen > 0) {
 			/* copy the previous call's tmpbuf to outbuf */
 			memcpy (bufptr, uubuf, ((uulen / 3) * 4));
@@ -209,17 +209,17 @@ camel_uuencode_step (guchar *in, gsize len, guchar *out, guchar *uubuf, gint *st
 		b1 = saved & 0xff;
 		saved = 0;
 		i = 0;
-		
+
 		goto skip2;
 	} else if (i == 1) {
 		if ((inptr + 2) < inend) {
 			b0 = saved & 0xff;
 			saved = 0;
 			i = 0;
-			
+
 			goto skip1;
 		}
-		
+
 		while (inptr < inend) {
 			saved = (saved << 8) | *inptr++;
 			i++;
@@ -233,23 +233,23 @@ camel_uuencode_step (guchar *in, gsize len, guchar *out, guchar *uubuf, gint *st
 			b1 = *inptr++;
 		skip2:
 			b2 = *inptr++;
-			
+
 			/* convert 3 normal bytes into 4 uuencoded bytes */
 			*bufptr++ = CAMEL_UUENCODE_CHAR ((b0 >> 2) & 0x3f);
 			*bufptr++ = CAMEL_UUENCODE_CHAR (((b0 << 4) | ((b1 >> 4) & 0xf)) & 0x3f);
 			*bufptr++ = CAMEL_UUENCODE_CHAR (((b1 << 2) | ((b2 >> 6) & 0x3)) & 0x3f);
 			*bufptr++ = CAMEL_UUENCODE_CHAR (b2 & 0x3f);
-			
+
 			uulen += 3;
 		}
 
 		if (uulen >= 45) {
 			*outptr++ = CAMEL_UUENCODE_CHAR (uulen & 0xff);
 			outptr += ((45 / 3) * 4) + 1;
-			
+
 			*outptr++ = '\n';
 			uulen = 0;
-			
+
 			if ((inptr + 45) <= inend) {
 				/* we have enough input to output another full line */
 				bufptr = outptr + 1;
@@ -310,7 +310,7 @@ camel_uudecode_step (guchar *in, gsize len, guchar *out, gint *state, guint32 *s
 	while (inptr < inend) {
 		if (*inptr == '\n') {
 			last_was_eoln = TRUE;
-			
+
 			inptr++;
 			continue;
 		} else if (!uulen || last_was_eoln) {
@@ -321,7 +321,7 @@ camel_uudecode_step (guchar *in, gsize len, guchar *out, gint *state, guint32 *s
 				*state |= CAMEL_UUDECODE_STATE_END;
 				break;
 			}
-			
+
 			inptr++;
 			continue;
 		}
@@ -351,7 +351,7 @@ camel_uudecode_step (guchar *in, gsize len, guchar *out, gint *state, guint32 *s
 						*outptr++ = CAMEL_UUDECODE_CHAR (b0) << 2 | CAMEL_UUDECODE_CHAR (b1) >> 4;
 						uulen--;
 					}
-					
+
 					if (uulen >= 2) {
 						*outptr++ = CAMEL_UUDECODE_CHAR (b1) << 4 | CAMEL_UUDECODE_CHAR (b2) >> 2;
 						uulen--;
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
index 290f2d1..d641ef2 100644
--- a/camel/camel-tcp-stream-raw.c
+++ b/camel/camel-tcp-stream-raw.c
@@ -743,7 +743,7 @@ out:
 
 /* Resolves a port number using getaddrinfo().  Returns 0 if the port can't be resolved or if the operation is cancelled */
 static gint
-resolve_port (const char *service, gint fallback_port, GError **error)
+resolve_port (const gchar *service, gint fallback_port, GError **error)
 {
 	struct addrinfo *ai;
 	GError *my_error;
@@ -820,7 +820,7 @@ socks5_initiate_and_request_authentication (CamelTcpStreamRaw *raw, PRFileDesc *
 	return TRUE;
 }
 
-static const char *
+static const gchar *
 socks5_reply_error_to_string (gchar error_code)
 {
 	switch (error_code) {
@@ -884,7 +884,7 @@ incomplete_reply:
 }
 
 static gboolean
-socks5_request_connect (CamelTcpStreamRaw *raw, PRFileDesc *fd, const char *host, gint port, GError **error)
+socks5_request_connect (CamelTcpStreamRaw *raw, PRFileDesc *fd, const gchar *host, gint port, GError **error)
 {
 	gchar *request;
 	gchar reply[3];
@@ -946,15 +946,15 @@ socks5_request_connect (CamelTcpStreamRaw *raw, PRFileDesc *fd, const char *host
 	 */
 	if (!socks5_consume_reply_address (raw, fd, error))
 		return FALSE;
-	
+
 	return TRUE;
 }
 
 /* RFC 1928 - SOCKS protocol version 5 */
 static PRFileDesc *
 connect_to_socks5_proxy (CamelTcpStreamRaw *raw,
-			 const char *proxy_host, gint proxy_port,
-			 const char *host, const char *service, gint fallback_port,
+			 const gchar *proxy_host, gint proxy_port,
+			 const gchar *host, const gchar *service, gint fallback_port,
 			 GError **error)
 {
 	PRFileDesc *fd;
@@ -996,12 +996,12 @@ out:
 	d (g_print ("}\n"));
 
 	return fd;
-	
+
 }
 
 static gint
 tcp_stream_raw_connect (CamelTcpStream *stream,
-			const char *host, const char *service, gint fallback_port,
+			const gchar *host, const gchar *service, gint fallback_port,
                         GError **error)
 {
 	CamelTcpStreamRaw *raw = CAMEL_TCP_STREAM_RAW (stream);
@@ -1038,7 +1038,7 @@ tcp_stream_raw_connect (CamelTcpStream *stream,
 	my_error = NULL;
 	addr = camel_getaddrinfo (host, service, &hints, &my_error);
 	if (addr == NULL && fallback_port != 0 && !g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-		char str_port[16];
+		gchar str_port[16];
 
 		g_clear_error (&my_error);
 		sprintf (str_port, "%d", fallback_port);
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index ddede42..11b5b8b 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -706,7 +706,7 @@ rehandshake_ssl (PRFileDesc *fd, GError **error)
 }
 
 static gint
-tcp_stream_ssl_connect (CamelTcpStream *stream, const char *host, const char *service, gint fallback_port, GError **error)
+tcp_stream_ssl_connect (CamelTcpStream *stream, const gchar *host, const gchar *service, gint fallback_port, GError **error)
 {
 	CamelTcpStreamSSL *ssl = CAMEL_TCP_STREAM_SSL (stream);
 	gint retval;
diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
index d28cee6..1738051 100644
--- a/camel/camel-tcp-stream.c
+++ b/camel/camel-tcp-stream.c
@@ -93,7 +93,7 @@ camel_tcp_stream_init (CamelTcpStream *tcp_stream)
  **/
 gint
 camel_tcp_stream_connect (CamelTcpStream *stream,
-			  const char *host, const char *service, gint fallback_port,
+			  const gchar *host, const gchar *service, gint fallback_port,
                           GError **error)
 {
 	CamelTcpStreamClass *class;
diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h
index 4680d0e..84a04e5 100644
--- a/camel/camel-tcp-stream.h
+++ b/camel/camel-tcp-stream.h
@@ -125,7 +125,7 @@ struct _CamelTcpStreamClass {
 	CamelStreamClass parent_class;
 
 	gint		(*connect)		(CamelTcpStream *stream,
-						 const char *host, const char *service, gint fallback_port,
+						 const gchar *host, const gchar *service, gint fallback_port,
 						 GError **error);
 	gint		(*getsockopt)		(CamelTcpStream *stream,
 						 CamelSockOptData *data);
@@ -143,7 +143,7 @@ struct _CamelTcpStreamClass {
 
 GType		camel_tcp_stream_get_type	(void);
 gint		camel_tcp_stream_connect	(CamelTcpStream *stream,
-						 const char *host, const char *service, gint fallback_port,
+						 const gchar *host, const gchar *service, gint fallback_port,
 						 GError **error);
 gint		camel_tcp_stream_getsockopt	(CamelTcpStream *stream,
 						 CamelSockOptData *data);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 15014f1..d241ee5 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -421,7 +421,7 @@ enum {
 
 static gboolean
 connect_to_server (CamelService *service,
-		   const char *host, const char *serv, gint fallback_port, gint ssl_mode, GError **error)
+		   const gchar *host, const gchar *serv, gint fallback_port, gint ssl_mode, GError **error)
 {
 	CamelImapStore *store = (CamelImapStore *) service;
 	CamelSession *session;
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 461f7fa..943368d 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -205,7 +205,7 @@ enum {
 #endif
 
 static gboolean
-connect_to_server (CamelService *service, const char *host, const char *serv, gint fallback_port, gint ssl_mode, GError **error)
+connect_to_server (CamelService *service, const gchar *host, const gchar *serv, gint fallback_port, gint ssl_mode, GError **error)
 {
 	CamelNNTPStore *store = (CamelNNTPStore *) service;
 	CamelDiscoStore *disco_store = (CamelDiscoStore*) service;
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 8bdbb9f..75bf75a 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -103,7 +103,7 @@ get_valid_utf8_error (const gchar *text)
 
 static gboolean
 connect_to_server (CamelService *service,
-		   const char *host, const char *serv, gint fallback_port,
+		   const gchar *host, const gchar *serv, gint fallback_port,
                    gint ssl_mode,
                    GError **error)
 {
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 4d2fa8e..91a926f 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -183,7 +183,7 @@ enum {
 
 static gboolean
 connect_to_server (CamelService *service,
-		   const char *host, const char *serv, gint fallback_port,
+		   const gchar *host, const gchar *serv, gint fallback_port,
                    gint ssl_mode,
                    GError **error)
 {
diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index d8852f2..94b1ca7 100644
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -464,6 +464,8 @@ CamelCipherContext
 @gpointer cert_data: 
 @gpointer cert_data:
 @gpointer cert_data: 
+ gpointer cert_data:
+ gpointer cert_data: 
 @gpointer cert_data: 
 
 
diff --git a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
index 3c0583f..57f53cd 100644
--- a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
+++ b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
@@ -25,7 +25,7 @@ CamelTcpStreamSSL
 
 </para>
 
- parent: 
+ parent_object: 
 @priv: 
 
 <!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 ##### -->
@@ -80,12 +80,3 @@ CamelTcpStreamSSL
 @Returns: 
 
 
-<!-- ##### FUNCTION camel_tcp_stream_ssl_sockfd ##### -->
-<para>
-
-</para>
-
- stream: 
- Returns: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-tcp-stream.sgml b/docs/reference/camel/tmpl/camel-tcp-stream.sgml
index ae97977..110f656 100644
--- a/docs/reference/camel/tmpl/camel-tcp-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-tcp-stream.sgml
@@ -69,6 +69,8 @@ CamelTcpStream
 
 @stream: 
 @host: 
+ service: 
+ fallback_port: 
 @error: 
 @Returns: 
 
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index 1771500..edfab65 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -7760,6 +7760,14 @@ streams
 @handle: 
 @Returns: 
 
+<!-- ##### FUNCTION camel_tcp_stream_ssl_sockfd ##### -->
+<para>
+
+</para>
+
+ stream: 
+ Returns: 
+
 <!-- ##### FUNCTION camel_test_end ##### -->
 <para>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]