GNOME.org
 

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

commit a9c6538ac5bf6fa8db2977c4443eecd303f880cc
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Aug 28 16:34:14 2010 -0400

    Coding style and whitespace cleanup.

 addressbook/libebook/e-book.h                      |    2 +-
 .../groupwise/e-cal-backend-groupwise-utils.c      |    4 ++--
 calendar/libecal/e-cal-component.c                 |    2 +-
 calendar/libecal/e-cal-recur.c                     |    2 +-
 camel/camel-mime-utils.c                           |    4 ++--
 camel/camel-mime-utils.h                           |    2 +-
 camel/camel-net-utils.c                            |    2 +-
 camel/camel-tcp-stream.h                           |    4 ++--
 camel/providers/imapx/camel-imapx-server.c         |    2 +-
 libedataserver/e-time-utils.c                      |    2 +-
 servers/groupwise/e-gw-recur-utils.c               |    2 +-
 servers/groupwise/e-gw-recur-utils.h               |   12 ++++++------
 12 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/addressbook/libebook/e-book.h b/addressbook/libebook/e-book.h
index c2dde74..2e5b7d1 100644
--- a/addressbook/libebook/e-book.h
+++ b/addressbook/libebook/e-book.h
@@ -41,7 +41,7 @@ typedef void (*EBookCallback) (EBook *book, EBookStatus status, gpointer closure
 typedef void (*EBookAsyncCallback) (EBook *book, const GError *error, gpointer closure);
 typedef void (*EBookOpenProgressCallback)     (EBook          *book,
 					       const gchar     *status_message,
-					       short           percent,
+					       gshort           percent,
 					       gpointer        closure);
 #ifndef E_BOOK_DISABLE_DEPRECATED
 typedef void (*EBookIdCallback)       (EBook *book, EBookStatus status, const gchar *id, gpointer closure);
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
index 24cdcef..54816ca 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
@@ -2002,13 +2002,13 @@ e_gw_connection_get_freebusy_info (ECalBackendGroupwise *cbgw, GList *users, tim
 #define SET_DELTA(fieldname) G_STMT_START{                                                                \
 	fieldname = e_gw_item_get_##fieldname (item);                                                       \
 	cache_##fieldname = e_gw_item_get_##fieldname (cache_item);                                           \
-	if ( cache_##fieldname ) {                                                                            \
+	if (cache_##fieldname) {                                                                            \
 		if (!fieldname )                                                                               \
 			e_gw_item_set_change (item, E_GW_ITEM_CHANGE_TYPE_DELETE, #fieldname, (gpointer) cache_##fieldname );\
 		else if (strcmp ( fieldname, cache_##fieldname ))                                               \
 			e_gw_item_set_change (item, E_GW_ITEM_CHANGE_TYPE_UPDATE, #fieldname, (gpointer) fieldname );\
 	}                                                                                                 \
-	else if ( fieldname )                                                                               \
+	else if (fieldname)                                                                               \
 		e_gw_item_set_change (item, E_GW_ITEM_CHANGE_TYPE_ADD, #fieldname, (gpointer) fieldname );           \
 	}G_STMT_END
 
diff --git a/calendar/libecal/e-cal-component.c b/calendar/libecal/e-cal-component.c
index bfb093d..5f62c8a 100644
--- a/calendar/libecal/e-cal-component.c
+++ b/calendar/libecal/e-cal-component.c
@@ -3811,7 +3811,7 @@ e_cal_component_has_recurrences (ECalComponent *comp)
 
 /* Counts the elements in the by_xxx fields of an icalrecurrencetype */
 static gint
-count_by_xxx (short *field, gint max_elements)
+count_by_xxx (gshort *field, gint max_elements)
 {
 	gint i;
 
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index 16f02bf..5d80b66 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -895,7 +895,7 @@ e_cal_recur_generate_instances_of_rule (ECalComponent	 *comp,
  * struct icalrecurrencetype.
  */
 static GList *
-array_to_list (short *array, gint max_elements)
+array_to_list (gshort *array, gint max_elements)
 {
 	GList *l;
 	gint i;
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index e2ba2c6..11332cd 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -668,7 +668,7 @@ quoted_decode(const guchar *in, gsize len, guchar *out)
 /* safemask is the mask to apply to the camel_mime_special_table to determine what
    characters can safely be included without encoding */
 static gsize
-quoted_encode (const guchar *in, gsize len, guchar *out, unsigned short safemask)
+quoted_encode (const guchar *in, gsize len, guchar *out, gushort safemask)
 {
 	register const guchar *inptr, *inend;
 	guchar *outptr;
@@ -1282,7 +1282,7 @@ camel_header_format_ctext (const gchar *in, const gchar *default_charset)
 
 /* FIXME: needs a way to cache iconv opens for different charsets? */
 static void
-rfc2047_encode_word(GString *outstring, const gchar *in, gsize len, const gchar *type, unsigned short safemask)
+rfc2047_encode_word(GString *outstring, const gchar *in, gsize len, const gchar *type, gushort safemask)
 {
 	iconv_t ic = (iconv_t) -1;
 	gchar *buffer, *out, *ascii;
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index d83e411..75e2a9c 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -257,7 +257,7 @@ enum {
 	CAMEL_MIME_IS_ATTRCHAR  = 1<<9	/* attribute-char safe (rfc2184) */
 };
 
-extern unsigned short camel_mime_special_table[256];
+extern gushort camel_mime_special_table[256];
 
 #define camel_mime_is_ctrl(x) ((camel_mime_special_table[(guchar)(x)] & CAMEL_MIME_IS_CTRL) != 0)
 #define camel_mime_is_lwsp(x) ((camel_mime_special_table[(guchar)(x)] & CAMEL_MIME_IS_LWSP) != 0)
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index 70d4b92..d2b44f3 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -52,7 +52,7 @@
 
 #ifdef G_OS_WIN32
 
-typedef short in_port_t;
+typedef gshort in_port_t;
 
 #undef gai_strerror
 #define gai_strerror my_gai_strerror
diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h
index 84a04e5..4054f21 100644
--- a/camel/camel-tcp-stream.h
+++ b/camel/camel-tcp-stream.h
@@ -36,8 +36,8 @@
 typedef struct linger CamelLinger;
 #else
 typedef struct {
-	unsigned short l_onoff;
-	unsigned short l_linger;
+	gushort l_onoff;
+	gushort l_linger;
 } CamelLinger;
 #define socklen_t int
 struct addrinfo;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 29b417d..4408e09 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -223,7 +223,7 @@ struct _CamelIMAPXJob {
 	gint noreply:1;		/* dont wait for reply */
 	guint32 type;		/* operation type */
 	gint pri;		/* the command priority */
-	short commands;		/* counts how many commands are outstanding */
+	gshort commands;		/* counts how many commands are outstanding */
 
 	CamelFolder *folder;
 	CamelOperation *op;
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index ff0efa3..5599972 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -337,7 +337,7 @@ static gchar const ab_month_name[][4] =
 # define HERE_T_FMT_AMPM "%I:%M:%S %p"
 # define HERE_T_FMT "%H:%M:%S"
 
-static const unsigned short __mon_yday[2][13] =
+static const gushort __mon_yday[2][13] =
   {
     /* Normal years.  */
     { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
diff --git a/libedataserverui/e-cell-renderer-color.c b/libedataserverui/e-cell-renderer-color.c
old mode 100755
new mode 100644
diff --git a/servers/groupwise/e-gw-recur-utils.c b/servers/groupwise/e-gw-recur-utils.c
index 16e3701..98658eb 100644
--- a/servers/groupwise/e-gw-recur-utils.c
+++ b/servers/groupwise/e-gw-recur-utils.c
@@ -28,7 +28,7 @@
 static const gchar *days_of_week[7] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
 
 const gchar *
-e_gw_recur_get_day_of_week (short day)
+e_gw_recur_get_day_of_week (gshort day)
 {
 
 	if (day < 1 || day > 7)
diff --git a/servers/groupwise/e-gw-recur-utils.h b/servers/groupwise/e-gw-recur-utils.h
index 72d11f4..933962c 100644
--- a/servers/groupwise/e-gw-recur-utils.h
+++ b/servers/groupwise/e-gw-recur-utils.h
@@ -57,15 +57,15 @@ typedef struct {
 	gchar *until;
 	gint count;
 	gint interval;
-	short by_day[E_GW_ITEM_BY_DAY_SIZE];
-	short by_month_day[E_GW_ITEM_BY_MONTHDAY_SIZE];
-	short by_year_day[E_GW_ITEM_BY_YEARDAY_SIZE];
-	short by_month[E_GW_ITEM_BY_MONTH_SIZE];
-	short by_setpos [E_GW_ITEM_BY_SETPOS_SIZE];
+	gshort by_day[E_GW_ITEM_BY_DAY_SIZE];
+	gshort by_month_day[E_GW_ITEM_BY_MONTHDAY_SIZE];
+	gshort by_year_day[E_GW_ITEM_BY_YEARDAY_SIZE];
+	gshort by_month[E_GW_ITEM_BY_MONTH_SIZE];
+	gshort by_setpos [E_GW_ITEM_BY_SETPOS_SIZE];
 } EGwItemRecurrenceRule;
 
 #define E_GW_ITEM_RECUR_END_MARKER  0x7f7f
 
-const gchar *e_gw_recur_get_day_of_week (short day);
+const gchar *e_gw_recur_get_day_of_week (gshort day);
 
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]