[evolution-patches] Cleanups for evolution-data-server
- From: Kjartan Maraas <kmaraas broadpark no>
- To: evolution-patches gnome org
- Subject: [evolution-patches] Cleanups for evolution-data-server
- Date: Thu, 20 Oct 2005 12:08:18 -0000
Hi.
This patch has a lot of cleanups for warnings from sparse, the intel
compiler and valgrind runs. Probably not 100% ready for prime time yet,
but I'm sending it here so more people can take a look.
Cheers
Kjartan
? depcomp
? e-d-s-cleanups.patch
? gtk-doc.make
? iconv-detect.h
? warnings
? warnings-icc
? warnings.sparse
? calendar/config.guess
? calendar/config.sub
? calendar/depcomp
? calendar/install-sh
? calendar/ltmain.sh
? calendar/missing
? calendar/mkinstalldirs
? calendar/ylwrap
? calendar/tests/ecal/test-recur
? camel/camel-mime-tables.c
? docs/reference/calendar/libedata-cal/libedata-cal-decl-list.txt
? docs/reference/calendar/libedata-cal/libedata-cal-decl.txt
? docs/reference/calendar/libedata-cal/tmpl/libedata-cal-unused.sgml
? docs/reference/camel/Makefile
? docs/reference/camel/Makefile.in
? docs/reference/libedataserver/tmpl/e-account-list.sgml
? docs/reference/libedataserver/tmpl/e-account.sgml
? docs/reference/libedataserver/tmpl/e-categories.sgml
? docs/reference/libedataserver/tmpl/e-component-listener.sgml
? docs/reference/libedataserver/tmpl/e-data-server-module.sgml
? docs/reference/libedataserver/tmpl/e-db3-utils.sgml
? docs/reference/libedataserver/tmpl/e-dbhash.sgml
? docs/reference/libedataserver/tmpl/e-file-cache.sgml
? docs/reference/libedataserver/tmpl/e-iconv.sgml
? docs/reference/libedataserver/tmpl/e-iterator.sgml
? docs/reference/libedataserver/tmpl/e-list-iterator.sgml
? docs/reference/libedataserver/tmpl/e-list.sgml
? docs/reference/libedataserver/tmpl/e-memory.sgml
? docs/reference/libedataserver/tmpl/e-source-group.sgml
? docs/reference/libedataserver/tmpl/e-source-list.sgml
? docs/reference/libedataserver/tmpl/e-source.sgml
? libedataserverui/test-contact-store
? libedataserverui/test-name-selector
? servers/exchange/Makefile
? servers/exchange/Makefile.in
? servers/exchange/lib/Makefile
? servers/exchange/lib/Makefile.in
? servers/exchange/lib/e2k-marshal.c
? servers/exchange/lib/e2k-marshal.h
? servers/exchange/lib/e2k-propnames.c
? servers/exchange/lib/e2k-propnames.h
? servers/exchange/lib/e2k-proptags.h
? servers/exchange/storage/Makefile
? servers/exchange/storage/Makefile.in
? servers/exchange/storage/e-shell-marshal.c
? servers/exchange/storage/e-shell-marshal.h
? servers/exchange/storage/libexchange-storage-1.2.pc
? servers/exchange/storage/libexchange-storage.pc
? servers/exchange/xntlm/Makefile
? servers/exchange/xntlm/Makefile.in
? src/GNOME_Evolution_DataServer_1.2.server
Index: addressbook/backends/groupwise/e-book-backend-groupwise.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c,v
retrieving revision 1.68
diff -u -p -r1.68 e-book-backend-groupwise.c
--- addressbook/backends/groupwise/e-book-backend-groupwise.c 31 Aug 2005 04:21:49 -0000 1.68
+++ addressbook/backends/groupwise/e-book-backend-groupwise.c 20 Oct 2005 06:58:54 -0000
@@ -99,7 +99,7 @@ static void set_ims_in_gw_item (EGwItem
static void set_im_changes (EGwItem *new_item, EGwItem *old_item);
static void fill_contact_from_gw_item (EContact *contact, EGwItem *item, GHashTable *categories_by_ids);
-struct field_element_mapping {
+static struct field_element_mapping {
EContactField field_id;
int element_type;
char *element_name;
Index: addressbook/backends/vcf/e-book-backend-vcf.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/vcf/e-book-backend-vcf.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-book-backend-vcf.c
--- addressbook/backends/vcf/e-book-backend-vcf.c 31 Aug 2005 04:21:50 -0000 1.19
+++ addressbook/backends/vcf/e-book-backend-vcf.c 20 Oct 2005 06:58:55 -0000
@@ -68,7 +68,7 @@ struct _EBookBackendVCFPrivate {
};
static char *
-e_book_backend_vcf_create_unique_id ()
+e_book_backend_vcf_create_unique_id (void)
{
/* use a 32 counter and the 32 bit timestamp to make an id.
it's doubtful 2^32 id's will be created in a second, so we
Index: addressbook/libebook/e-address-western.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-address-western.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-address-western.c
--- addressbook/libebook/e-address-western.c 4 May 2005 08:46:12 -0000 1.3
+++ addressbook/libebook/e-address-western.c 20 Oct 2005 06:58:56 -0000
@@ -311,7 +311,7 @@ e_address_western_parse (const gchar *in
gint linecntr, lineindex;
gchar *address;
gint cntr;
- gboolean found_po_box, found_postal;
+ gboolean found_postal;
EAddressWestern *eaw;
#if 0
@@ -368,14 +368,12 @@ e_address_western_parse (const gchar *in
e_address_western_remove_blank_lines (lines, &linecntr);
/* Let's just test these functions. */
- found_po_box = FALSE;
found_postal = FALSE;
for (cntr = 0; cntr < linecntr; cntr++) {
if (e_address_western_is_po_box (lines[cntr])) {
if (eaw->po_box == NULL)
eaw->po_box = e_address_western_extract_po_box (lines[cntr]);
- found_po_box = TRUE;
}
else if (e_address_western_is_postal (lines[cntr])) {
if (eaw->locality == NULL)
Index: addressbook/libebook/e-book-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-book-listener.c,v
retrieving revision 1.18
diff -u -p -r1.18 e-book-listener.c
--- addressbook/libebook/e-book-listener.c 24 Aug 2005 02:37:53 -0000 1.18
+++ addressbook/libebook/e-book-listener.c 20 Oct 2005 06:58:56 -0000
@@ -399,7 +399,7 @@ impl_BookListener_respond_progress (Port
* Returns: a new #EBookListener
*/
EBookListener *
-e_book_listener_new ()
+e_book_listener_new (void)
{
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
static PortableServer_POA poa = NULL;
@@ -491,4 +491,4 @@ BONOBO_TYPE_FUNC_FULL (
EBookListener,
GNOME_Evolution_Addressbook_BookListener,
BONOBO_TYPE_OBJECT,
- e_book_listener);
+ e_book_listener)
Index: addressbook/libebook/e-book-view-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-book-view-listener.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-book-view-listener.c
--- addressbook/libebook/e-book-view-listener.c 22 Jun 2005 12:34:22 -0000 1.11
+++ addressbook/libebook/e-book-view-listener.c 20 Oct 2005 06:58:57 -0000
@@ -281,7 +281,7 @@ e_book_view_listener_convert_status (con
* Return value: a new #EBookViewListener
*/
EBookViewListener *
-e_book_view_listener_new ()
+e_book_view_listener_new (void)
{
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
static PortableServer_POA poa = NULL;
@@ -396,4 +396,4 @@ BONOBO_TYPE_FUNC_FULL (
EBookViewListener,
GNOME_Evolution_Addressbook_BookViewListener,
BONOBO_TYPE_OBJECT,
- e_book_view_listener);
+ e_book_view_listener)
Index: addressbook/libebook/e-book.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-book.c,v
retrieving revision 1.54
diff -u -p -r1.54 e-book.c
--- addressbook/libebook/e-book.c 25 Jul 2005 09:04:04 -0000 1.54
+++ addressbook/libebook/e-book.c 20 Oct 2005 06:58:59 -0000
@@ -3026,10 +3026,8 @@ static gboolean
e_book_idle_auth_required (gpointer data)
{
EBook *book = data;
- gboolean connected;
g_mutex_lock (book->priv->mutex);
- connected = book->priv->connected;
book->priv->auth_idle_id = 0;
g_mutex_unlock (book->priv->mutex);
@@ -3204,7 +3202,6 @@ activate_factories_for_uri (EBook *book,
g_free (exc_text);
CORBA_exception_free (&ev);
goto done;
- return NULL;
}
if (info_list->_length == 0) {
@@ -3730,7 +3727,7 @@ startup_mainloop (void *arg)
/* one-time start up for libebook */
static void
-e_book_activate()
+e_book_activate(void)
{
static GStaticMutex e_book_lock = G_STATIC_MUTEX_INIT;
static gboolean activated = FALSE;
@@ -3802,7 +3799,7 @@ e_book_new_from_uri (const char *uri, GE
ESource *source;
EBook *book;
- e_return_error_if_fail (uri, E_BOOK_ERROR_INVALID_ARG);
+ e_return_error_if_fail (uri, E_BOOK_ERROR_INVALID_ARG);
group = e_source_group_new ("", uri);
source = e_source_new ("", "");
@@ -3840,7 +3837,7 @@ e_book_new_system_addressbook (GError
if (!e_book_get_addressbooks (&sources, &err)) {
if (error)
g_propagate_error (error, err);
- return FALSE;
+ return NULL;
}
for (g = e_source_list_peek_groups (sources); g; g = g->next) {
@@ -3912,7 +3909,7 @@ e_book_new_default_addressbook (GError
if (!e_book_get_addressbooks (&sources, &err)) {
if (error)
g_propagate_error (error, err);
- return FALSE;
+ return NULL;
}
for (g = e_source_list_peek_groups (sources); g; g = g->next) {
Index: addressbook/libebook/e-contact.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.c,v
retrieving revision 1.50
diff -u -p -r1.50 e-contact.c
--- addressbook/libebook/e-contact.c 31 Aug 2005 04:21:51 -0000 1.50
+++ addressbook/libebook/e-contact.c 20 Oct 2005 06:59:01 -0000
@@ -1673,7 +1673,7 @@ e_contact_set_attributes (EContact *cont
* Return value: A new #EContactName struct.
**/
EContactName*
-e_contact_name_new ()
+e_contact_name_new (void)
{
return g_new0 (EContactName, 1);
}
Index: addressbook/libebook/e-name-western-tables.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-name-western-tables.h,v
retrieving revision 1.2
diff -u -p -r1.2 e-name-western-tables.h
--- addressbook/libebook/e-name-western-tables.h 3 May 2004 16:43:00 -0000 1.2
+++ addressbook/libebook/e-name-western-tables.h 20 Oct 2005 06:59:01 -0000
@@ -3,7 +3,7 @@
G_BEGIN_DECLS
-char *e_name_western_pfx_table[] = {
+static const char *e_name_western_pfx_table[] = {
/*
* English.
@@ -50,7 +50,7 @@ char *e_name_western_pfx_table[] = {
NULL};
-char *e_name_western_sfx_table[] = {
+static const char *e_name_western_sfx_table[] = {
/*
* English.
@@ -62,7 +62,7 @@ char *e_name_western_sfx_table[] = {
NULL};
-char *e_name_western_twopart_sfx_table[] = {
+static const char *e_name_western_twopart_sfx_table[] = {
/*
* English.
@@ -71,7 +71,7 @@ char *e_name_western_twopart_sfx_table[]
NULL};
-char *e_name_western_complex_last_table[] = {"van", "von", "de", "di", NULL};
+static const char *e_name_western_complex_last_table[] = {"van", "von", "de", "di", NULL};
G_END_DECLS
Index: addressbook/libebook/e-vcard.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-vcard.c,v
retrieving revision 1.23
diff -u -p -r1.23 e-vcard.c
--- addressbook/libebook/e-vcard.c 31 Aug 2005 04:21:51 -0000 1.23
+++ addressbook/libebook/e-vcard.c 20 Oct 2005 06:59:03 -0000
@@ -704,7 +704,7 @@ e_vcard_construct (EVCard *evc, const ch
* Return value: A new, blank #EVCard.
**/
EVCard *
-e_vcard_new ()
+e_vcard_new (void)
{
return e_vcard_new_from_string ("");
}
Index: addressbook/libedata-book/e-data-book.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libedata-book/e-data-book.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-data-book.c
--- addressbook/libedata-book/e-data-book.c 14 May 2005 06:36:47 -0000 1.11
+++ addressbook/libedata-book/e-data-book.c 20 Oct 2005 06:59:04 -0000
@@ -20,7 +20,7 @@
#include "e-data-book.h"
static BonoboObjectClass *e_data_book_parent_class;
-POA_GNOME_Evolution_Addressbook_Book__vepv e_data_book_vepv;
+static POA_GNOME_Evolution_Addressbook_Book__vepv e_data_book_vepv;
struct _EDataBookPrivate {
EBookBackend *backend;
Index: addressbook/tests/ebook/test-photo.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/tests/ebook/test-photo.c,v
retrieving revision 1.4
diff -u -p -r1.4 test-photo.c
--- addressbook/tests/ebook/test-photo.c 4 Feb 2005 10:54:36 -0000 1.4
+++ addressbook/tests/ebook/test-photo.c 20 Oct 2005 06:59:04 -0000
@@ -3,7 +3,7 @@
#include <string.h>
#include <libebook/e-book.h>
-const char *photo_data = "/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\
+static const char *photo_data = "/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\
IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLC\
McHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIy\
MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAMgAyAwEiAAIRAQMRAf\
Index: addressbook/tests/vcard/dump-vcard.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/tests/vcard/dump-vcard.c,v
retrieving revision 1.2
diff -u -p -r1.2 dump-vcard.c
--- addressbook/tests/vcard/dump-vcard.c 11 Nov 2003 21:29:40 -0000 1.2
+++ addressbook/tests/vcard/dump-vcard.c 20 Oct 2005 06:59:04 -0000
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <libebook/e-vcard.h>
-FILE *fp;
+static FILE *fp;
int
main(int argc, char **argv)
Index: calendar/backends/file/e-cal-backend-file.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/file/e-cal-backend-file.c,v
retrieving revision 1.60
diff -u -p -r1.60 e-cal-backend-file.c
--- calendar/backends/file/e-cal-backend-file.c 31 Aug 2005 04:21:52 -0000 1.60
+++ calendar/backends/file/e-cal-backend-file.c 20 Oct 2005 06:59:07 -0000
@@ -290,6 +290,11 @@ e_cal_backend_file_finalize (GObject *ob
priv->uri = NULL;
}
+ if (priv->file_name) {
+ g_free (priv->file_name);
+ priv->file_name = NULL;
+ }
+
g_free (priv);
cbfile->priv = NULL;
Index: calendar/libecal/e-cal-recur.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-recur.c,v
retrieving revision 1.9
diff -u -p -r1.9 e-cal-recur.c
--- calendar/libecal/e-cal-recur.c 31 Aug 2005 04:21:54 -0000 1.9
+++ calendar/libecal/e-cal-recur.c 20 Oct 2005 06:59:13 -0000
@@ -510,7 +510,7 @@ static char* cal_obj_time_to_string (Ca
#endif
-ECalRecurVTable cal_obj_yearly_vtable = {
+static ECalRecurVTable cal_obj_yearly_vtable = {
cal_obj_yearly_find_start_position,
cal_obj_yearly_find_next_position,
@@ -524,7 +524,7 @@ ECalRecurVTable cal_obj_yearly_vtable =
cal_obj_bysecond_expand
};
-ECalRecurVTable cal_obj_monthly_vtable = {
+static ECalRecurVTable cal_obj_monthly_vtable = {
cal_obj_monthly_find_start_position,
cal_obj_monthly_find_next_position,
@@ -538,7 +538,7 @@ ECalRecurVTable cal_obj_monthly_vtable =
cal_obj_bysecond_expand
};
-ECalRecurVTable cal_obj_weekly_vtable = {
+static ECalRecurVTable cal_obj_weekly_vtable = {
cal_obj_weekly_find_start_position,
cal_obj_weekly_find_next_position,
@@ -552,7 +552,7 @@ ECalRecurVTable cal_obj_weekly_vtable =
cal_obj_bysecond_expand
};
-ECalRecurVTable cal_obj_daily_vtable = {
+static ECalRecurVTable cal_obj_daily_vtable = {
cal_obj_daily_find_start_position,
cal_obj_daily_find_next_position,
@@ -566,7 +566,7 @@ ECalRecurVTable cal_obj_daily_vtable = {
cal_obj_bysecond_expand
};
-ECalRecurVTable cal_obj_hourly_vtable = {
+static ECalRecurVTable cal_obj_hourly_vtable = {
cal_obj_hourly_find_start_position,
cal_obj_hourly_find_next_position,
@@ -580,7 +580,7 @@ ECalRecurVTable cal_obj_hourly_vtable =
cal_obj_bysecond_expand
};
-ECalRecurVTable cal_obj_minutely_vtable = {
+static ECalRecurVTable cal_obj_minutely_vtable = {
cal_obj_minutely_find_start_position,
cal_obj_minutely_find_next_position,
@@ -594,7 +594,7 @@ ECalRecurVTable cal_obj_minutely_vtable
cal_obj_bysecond_expand
};
-ECalRecurVTable cal_obj_secondly_vtable = {
+static ECalRecurVTable cal_obj_secondly_vtable = {
cal_obj_secondly_find_start_position,
cal_obj_secondly_find_next_position,
Index: calendar/libecal/e-cal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal.c,v
retrieving revision 1.113.2.3
diff -u -p -r1.113.2.3 e-cal.c
--- calendar/libecal/e-cal.c 1 Oct 2005 11:23:31 -0000 1.113.2.3
+++ calendar/libecal/e-cal.c 20 Oct 2005 06:59:15 -0000
@@ -1123,7 +1123,7 @@ e_cal_init (ECal *ecal, ECalClass *klass
priv->cal_address = NULL;
priv->alarm_email_address = NULL;
priv->ldap_attribute = NULL;
- priv->capabilities = FALSE;
+ priv->capabilities = NULL;
priv->factories = NULL;
priv->timezones = g_hash_table_new (g_str_hash, g_str_equal);
priv->default_zone = icaltimezone_get_utc_timezone ();
@@ -1375,7 +1375,7 @@ fetch_corba_cal (ECal *ecal, ESource *so
/* one-time start up for libecal */
static void
-e_cal_activate ()
+e_cal_activate (void)
{
static GStaticMutex e_cal_lock = G_STATIC_MUTEX_INIT;
static gboolean activated = FALSE;
Index: calendar/libedata-cal/e-cal-backend-cache.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-cal-backend-cache.c,v
retrieving revision 1.26
diff -u -p -r1.26 e-cal-backend-cache.c
--- calendar/libedata-cal/e-cal-backend-cache.c 31 Aug 2005 04:21:54 -0000 1.26
+++ calendar/libedata-cal/e-cal-backend-cache.c 20 Oct 2005 06:59:25 -0000
@@ -557,7 +557,7 @@ e_cal_backend_cache_get_timezone (ECalBa
* Return value: TRUE if the timezone was put on the cache, FALSE otherwise.
*/
gboolean
-e_cal_backend_cache_put_timezone (ECalBackendCache *cache, const icaltimezone *zone)
+e_cal_backend_cache_put_timezone (ECalBackendCache *cache, icaltimezone *zone)
{
ECalBackendCachePrivate *priv;
gpointer orig_key, orig_value;
Index: calendar/libedata-cal/e-cal-backend-cache.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-cal-backend-cache.h,v
retrieving revision 1.16
diff -u -p -r1.16 e-cal-backend-cache.h
--- calendar/libedata-cal/e-cal-backend-cache.h 31 Aug 2005 04:21:54 -0000 1.16
+++ calendar/libedata-cal/e-cal-backend-cache.h 20 Oct 2005 06:59:25 -0000
@@ -60,7 +60,7 @@ GSList *e_cal_backend_cache_
const icaltimezone *e_cal_backend_cache_get_timezone (ECalBackendCache *cache, const char *tzid);
-gboolean e_cal_backend_cache_put_timezone (ECalBackendCache *cache, const icaltimezone *zone);
+gboolean e_cal_backend_cache_put_timezone (ECalBackendCache *cache, icaltimezone *zone);
gboolean e_cal_backend_cache_remove_timezone (ECalBackendCache *cache, const char *tzid);
gboolean e_cal_backend_cache_put_default_timezone (ECalBackendCache *cache, icaltimezone *default_zone);
Index: calendar/libedata-cal/e-cal-backend.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-cal-backend.c,v
retrieving revision 1.20
diff -u -p -r1.20 e-cal-backend.c
--- calendar/libedata-cal/e-cal-backend.c 31 Aug 2005 04:21:54 -0000 1.20
+++ calendar/libedata-cal/e-cal-backend.c 20 Oct 2005 06:59:25 -0000
@@ -298,6 +298,8 @@ e_cal_backend_finalize (GObject *object)
g_mutex_free (priv->clients_mutex);
g_mutex_free (priv->queries_mutex);
+ g_free (priv->uri);
+
g_free (priv);
G_OBJECT_CLASS (parent_class)->finalize (object);
Index: calendar/libedata-cal/e-data-cal-factory.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-data-cal-factory.c,v
retrieving revision 1.13.2.2
diff -u -p -r1.13.2.2 e-data-cal-factory.c
--- calendar/libedata-cal/e-data-cal-factory.c 7 Oct 2005 09:02:47 -0000 1.13.2.2
+++ calendar/libedata-cal/e-data-cal-factory.c 20 Oct 2005 06:59:25 -0000
@@ -86,7 +86,7 @@ get_backend_factory (GHashTable *methods
kinds = g_hash_table_lookup (methods, method);
if (!kinds)
- return 0;
+ return NULL;
factory = g_hash_table_lookup (kinds, GINT_TO_POINTER (kind));
Index: calendar/libical/src/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- calendar/libical/src/Makefile.am 26 Feb 2004 20:25:58 -0000 1.13
+++ calendar/libical/src/Makefile.am 20 Oct 2005 06:59:25 -0000
@@ -4,4 +4,4 @@ else
LIBICALCAP_DIR =
endif
-SUBDIRS = libical libicalss $(LIBICALCAP_DIR) libicalvcal test
+SUBDIRS = libical libicalss $(LIBICALCAP_DIR) libicalvcal #test
Index: calendar/tests/ecal/test-ecal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/tests/ecal/test-ecal.c,v
retrieving revision 1.5
diff -u -p -r1.5 test-ecal.c
--- calendar/tests/ecal/test-ecal.c 31 Aug 2005 04:21:55 -0000 1.5
+++ calendar/tests/ecal/test-ecal.c 20 Oct 2005 06:59:25 -0000
@@ -603,8 +603,9 @@ test_timezones (ECal *client)
static char *
all_tests(ECal *client, const gchar *uri)
{
- ECal *ecal;
- char *tmp, *uid;
+// ECal *ecal;
+// char *tmp;
+ char *uid;
mu_run_test (test_new_system_calendar ());
mu_run_test (test_new_system_tasks ());
Index: camel/camel-data-cache.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-data-cache.c,v
retrieving revision 1.17
diff -u -p -r1.17 camel-data-cache.c
--- camel/camel-data-cache.c 31 Aug 2005 04:21:56 -0000 1.17
+++ camel/camel-data-cache.c 20 Oct 2005 06:59:25 -0000
@@ -248,7 +248,7 @@ data_cache_path(CamelDataCache *cdc, int
dd(printf("Checking expire cycle time on dir '%s'\n", dir));
/* This has a race, but at worst we re-run an expire cycle which is safe */
- now = time(0);
+ now = time(NULL);
if (cdc->priv->expire_last[hash] + CAMEL_DATA_CACHE_CYCLE_TIME < now) {
cdc->priv->expire_last[hash] = now;
data_cache_expire(cdc, dir, key, now);
Index: camel/camel-file-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-file-utils.c,v
retrieving revision 1.14
diff -u -p -r1.14 camel-file-utils.c
--- camel/camel-file-utils.c 31 Aug 2005 04:21:56 -0000 1.14
+++ camel/camel-file-utils.c 20 Oct 2005 06:59:25 -0000
@@ -416,7 +416,7 @@ camel_read (int fd, char *buf, size_t n)
tv.tv_usec = 0;
nread = -1;
- res = select(fdmax, &rdset, 0, 0, &tv);
+ res = select(fdmax, &rdset, NULL, NULL, &tv);
if (res == -1)
;
else if (res == 0)
@@ -492,7 +492,7 @@ camel_write (int fd, const char *buf, si
tv.tv_usec = 0;
w = -1;
- res = select (fdmax, &rdset, &wrset, 0, &tv);
+ res = select (fdmax, &rdset, &wrset, NULL, &tv);
if (res == -1) {
if (errno == EINTR)
w = 0;
Index: camel/camel-filter-driver.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-filter-driver.c,v
retrieving revision 1.94
diff -u -p -r1.94 camel-filter-driver.c
--- camel/camel-filter-driver.c 31 Aug 2005 04:21:56 -0000 1.94
+++ camel/camel-filter-driver.c 20 Oct 2005 06:59:25 -0000
@@ -1144,7 +1144,6 @@ camel_filter_driver_filter_mbox (CamelFi
struct stat st;
int status;
off_t last = 0;
- int ret = -1;
fd = open (mbox, O_RDONLY);
if (fd == -1) {
@@ -1164,7 +1163,7 @@ camel_filter_driver_filter_mbox (CamelFi
source_url = g_strdup_printf ("file://%s", mbox);
- while (camel_mime_parser_step (mp, 0, 0) == CAMEL_MIME_PARSER_STATE_FROM) {
+ while (camel_mime_parser_step (mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) {
CamelMessageInfo *info;
CamelMimeMessage *msg;
int pc = 0;
@@ -1197,7 +1196,7 @@ camel_filter_driver_filter_mbox (CamelFi
i++;
/* skip over the FROM_END state */
- camel_mime_parser_step (mp, 0, 0);
+ camel_mime_parser_step (mp, NULL, NULL);
camel_message_info_free (info);
}
@@ -1209,7 +1208,6 @@ camel_filter_driver_filter_mbox (CamelFi
report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));
- ret = 0;
fail:
g_free (source_url);
if (fd != -1)
Index: camel/camel-folder-search.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-folder-search.c,v
retrieving revision 1.74
diff -u -p -r1.74 camel-folder-search.c
--- camel/camel-folder-search.c 31 Aug 2005 04:21:56 -0000 1.74
+++ camel/camel-folder-search.c 20 Oct 2005 06:59:25 -0000
@@ -126,7 +126,7 @@ camel_folder_search_init (CamelFolderSea
the backing mempool. yes pretty weird, but i didn't want to change
the api just yet */
- p->mempool_hash = g_hash_table_new(0, 0);
+ p->mempool_hash = g_hash_table_new(NULL, NULL);
}
static void
@@ -182,7 +182,7 @@ camel_folder_search_get_type (void)
#define CAMEL_STRUCT_OFFSET(type, field) ((gint) ((gchar*) &((type *) 0)->field))
#endif
-struct {
+static struct {
char *name;
int offset;
int flags; /* 0x02 = immediate, 0x01 = always enter */
Index: camel/camel-folder-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-folder-summary.c,v
retrieving revision 1.144.2.1
diff -u -p -r1.144.2.1 camel-folder-summary.c
--- camel/camel-folder-summary.c 11 Oct 2005 11:07:55 -0000 1.144.2.1
+++ camel/camel-folder-summary.c 20 Oct 2005 06:59:28 -0000
@@ -171,7 +171,7 @@ camel_folder_summary_finalize (CamelObje
g_ptr_array_free(s->messages, TRUE);
g_hash_table_destroy(s->messages_uid);
- g_hash_table_foreach(p->filter_charset, free_o_name, 0);
+ g_hash_table_foreach(p->filter_charset, free_o_name, NULL);
g_hash_table_destroy(p->filter_charset);
g_free(s->summary_path);
@@ -1374,7 +1374,7 @@ my_list_append(struct _node **list, stru
struct _node *ln = (struct _node *)list;
while (ln->next)
ln = ln->next;
- n->next = 0;
+ n->next = NULL;
ln->next = n;
return n;
}
@@ -1854,11 +1854,9 @@ static CamelMessageContentInfo *
content_info_new_from_header(CamelFolderSummary *s, struct _camel_header_raw *h)
{
CamelMessageContentInfo *ci;
- const char *charset;
ci = camel_folder_summary_content_info_new (s);
- charset = e_iconv_locale_charset ();
ci->id = camel_header_msgid_decode (camel_header_raw_find (&h, "content-id", NULL));
ci->description = camel_header_decode_string (camel_header_raw_find (&h, "content-description", NULL), NULL);
ci->encoding = camel_content_transfer_encoding_decode (camel_header_raw_find (&h, "content-transfer-encoding", NULL));
@@ -2263,7 +2261,7 @@ camel_flag_set(CamelFlag **list, const c
if (value) {
tmp = g_malloc(sizeof(*tmp) + strlen(name));
strcpy(tmp->name, name);
- tmp->next = 0;
+ tmp->next = NULL;
flag->next = tmp;
}
return value;
@@ -2418,7 +2416,7 @@ camel_tag_set(CamelTag **list, const cha
tmp = g_malloc(sizeof(*tmp)+strlen(name));
strcpy(tmp->name, name);
tmp->value = g_strdup(value);
- tmp->next = 0;
+ tmp->next = NULL;
tag->next = tmp;
return TRUE;
}
@@ -2518,7 +2516,7 @@ camel_tag_list_free(CamelTag **list)
*list = NULL;
}
-struct flag_names_t {
+static struct flag_names_t {
char *name;
guint32 value;
} flag_names[] = {
Index: camel/camel-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-folder.c,v
retrieving revision 1.212
diff -u -p -r1.212 camel-folder.c
--- camel/camel-folder.c 31 Aug 2005 04:21:56 -0000 1.212
+++ camel/camel-folder.c 20 Oct 2005 06:59:31 -0000
@@ -885,7 +885,7 @@ camel_folder_get_message_user_tag (Camel
{
const char *ret;
- g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
+ g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
/* FIXME: should duplicate string */
ret = CF_CLASS (folder)->get_message_user_tag (folder, uid, name);
Index: camel/camel-http-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-http-stream.c,v
retrieving revision 1.20
diff -u -p -r1.20 camel-http-stream.c
--- camel/camel-http-stream.c 31 Aug 2005 04:21:56 -0000 1.20
+++ camel/camel-http-stream.c 20 Oct 2005 06:59:31 -0000
@@ -532,7 +532,7 @@ stream_reset (CamelStream *stream)
http_disconnect(http);
return 0;
-};
+}
CamelContentType *
camel_http_stream_get_content_type (CamelHttpStream *http_stream)
Index: camel/camel-list-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-list-utils.c,v
retrieving revision 1.3
diff -u -p -r1.3 camel-list-utils.c
--- camel/camel-list-utils.c 31 Aug 2005 04:21:56 -0000 1.3
+++ camel/camel-list-utils.c 20 Oct 2005 06:59:31 -0000
@@ -38,7 +38,7 @@
void camel_dlist_init(CamelDList *v)
{
v->head = (CamelDListNode *)&v->tail;
- v->tail = 0;
+ v->tail = NULL;
v->tailpred = (CamelDListNode *)&v->head;
}
Index: camel/camel-lock-helper.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-lock-helper.c,v
retrieving revision 1.7
diff -u -p -r1.7 camel-lock-helper.c
--- camel/camel-lock-helper.c 31 Aug 2005 04:21:56 -0000 1.7
+++ camel/camel-lock-helper.c 20 Oct 2005 06:59:31 -0000
@@ -188,7 +188,7 @@ static int lock_path(const char *path, g
info->id = lock_id;
info->depth = 1;
info->next = lock_info_list;
- info->stamp = time(0);
+ info->stamp = time(NULL);
lock_info_list = info;
if (lockid)
@@ -306,7 +306,7 @@ int main(int argc, char **argv)
/* check the minimum timeout we need to refresh the next oldest lock */
if (lock_info_list) {
- time_t now = time(0);
+ time_t now = time(NULL);
time_t left;
time_t delay = CAMEL_DOT_LOCK_REFRESH;
@@ -332,7 +332,7 @@ int main(int argc, char **argv)
/* did we get a timeout? scan for any locks that need updating */
if (!FD_ISSET(STDIN_FILENO, &rset)) {
- time_t now = time(0);
+ time_t now = time(NULL);
time_t left;
d(fprintf(stderr, "Got a timeout, checking locks\n"));
Index: camel/camel-lock.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-lock.c,v
retrieving revision 1.19
diff -u -p -r1.19 camel-lock.c
--- camel/camel-lock.c 31 Aug 2005 04:21:56 -0000 1.19
+++ camel/camel-lock.c 20 Oct 2005 06:59:31 -0000
@@ -138,7 +138,7 @@ camel_lock_dot(const char *path, CamelEx
/* check for stale lock, kill it */
if (stat(lock, &st) == 0) {
- time_t now = time(0);
+ time_t now = time(NULL);
(printf("There is an existing lock %ld seconds old\n", now-st.st_ctime));
if (st.st_ctime < now - CAMEL_LOCK_DOT_STALE) {
d(printf("Removing it now\n"));
Index: camel/camel-mime-filter-charset.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-charset.c,v
retrieving revision 1.32
diff -u -p -r1.32 camel-mime-filter-charset.c
--- camel/camel-mime-filter-charset.c 31 Aug 2005 04:21:56 -0000 1.32
+++ camel/camel-mime-filter-charset.c 20 Oct 2005 06:59:32 -0000
@@ -83,7 +83,7 @@ reset(CamelMimeFilter *mf)
/* what happens with the output bytes if this resets the state? */
if (f->ic != (iconv_t) -1) {
buffer = buf;
- e_iconv (f->ic, NULL, 0, &buffer, &outlen);
+ e_iconv (f->ic, NULL, NULL, &buffer, &outlen);
}
}
Index: camel/camel-mime-filter-html.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-html.c,v
retrieving revision 1.7
diff -u -p -r1.7 camel-mime-filter-html.c
--- camel/camel-mime-filter-html.c 31 Aug 2005 04:21:56 -0000 1.7
+++ camel/camel-mime-filter-html.c 20 Oct 2005 06:59:32 -0000
@@ -126,7 +126,6 @@ run(CamelMimeFilter *mf, char *in, size_
camel_html_parser_set_data(f->priv->ctxt, in, len, last);
do {
const char *data;
- int len;
state = camel_html_parser_step(f->priv->ctxt, &data, &len);
Index: camel/camel-mime-filter-linewrap.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-linewrap.c,v
retrieving revision 1.6
diff -u -p -r1.6 camel-mime-filter-linewrap.c
--- camel/camel-mime-filter-linewrap.c 31 Aug 2005 04:21:56 -0000 1.6
+++ camel/camel-mime-filter-linewrap.c 20 Oct 2005 06:59:32 -0000
@@ -71,7 +71,7 @@ filter (CamelMimeFilter *f, char *in, si
char **out, size_t *outlen, size_t *outprespace)
{
CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;
- char *inend, *last, *p, *q;
+ char *inend, *p, *q;
int nchars = linewrap->nchars;
/* we'll be adding chars here so we need a bigger buffer */
@@ -83,12 +83,9 @@ filter (CamelMimeFilter *f, char *in, si
while (p < inend) {
if (*p == '\n') {
- last = q;
*q++ = *p++;
nchars = 0;
} else if (isspace (*p)) {
- last = q;
-
if (nchars >= linewrap->wrap_len) {
*q++ = '\n';
p++;
Index: camel/camel-mime-filter-yenc.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-yenc.c,v
retrieving revision 1.4
diff -u -p -r1.4 camel-mime-filter-yenc.c
--- camel/camel-mime-filter-yenc.c 31 Aug 2005 04:21:56 -0000 1.4
+++ camel/camel-mime-filter-yenc.c 20 Oct 2005 06:59:32 -0000
@@ -416,7 +416,7 @@ size_t
camel_ydecode_step (const unsigned char *in, size_t inlen, unsigned char *out,
int *state, guint32 *pcrc, guint32 *crc)
{
- const register unsigned char *inptr;
+ register unsigned const char *inptr;
register unsigned char *outptr;
const unsigned char *inend;
unsigned char ch;
@@ -496,7 +496,7 @@ size_t
camel_yencode_step (const unsigned char *in, size_t inlen, unsigned char *out,
int *state, guint32 *pcrc, guint32 *crc)
{
- const register unsigned char *inptr;
+ register unsigned const char *inptr;
register unsigned char *outptr;
const unsigned char *inend;
register int already;
Index: camel/camel-mime-message.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-message.c,v
retrieving revision 1.136
diff -u -p -r1.136 camel-mime-message.c
--- camel/camel-mime-message.c 31 Aug 2005 04:21:56 -0000 1.136
+++ camel/camel-mime-message.c 20 Oct 2005 06:59:35 -0000
@@ -220,7 +220,7 @@ camel_mime_message_set_date (CamelMimeMe
struct tm local;
int tz;
- date = time(0);
+ date = time(NULL);
e_localtime_with_offset(date, &local, &tz);
offset = (((tz/60/60) * 100) + (tz/60 % 60));
}
Index: camel/camel-mime-parser.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-parser.c,v
retrieving revision 1.66
diff -u -p -r1.66 camel-mime-parser.c
--- camel/camel-mime-parser.c 31 Aug 2005 04:21:56 -0000 1.66
+++ camel/camel-mime-parser.c 20 Oct 2005 06:59:38 -0000
@@ -279,7 +279,7 @@ camel_mime_parser_filter_add(CamelMimePa
new->id = s->filterid++;
if (s->filterid == -1)
s->filterid++;
- new->next = 0;
+ new->next = NULL;
camel_object_ref((CamelObject *)mf);
/* yes, this is correct, since 'next' is the first element of the struct */
Index: camel/camel-mime-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-utils.c,v
retrieving revision 1.233
diff -u -p -r1.233 camel-mime-utils.c
--- camel/camel-mime-utils.c 31 Aug 2005 04:21:56 -0000 1.233
+++ camel/camel-mime-utils.c 20 Oct 2005 06:59:40 -0000
@@ -1068,7 +1068,7 @@ rfc2047_decode_word(const char *in, size
if (ic != (iconv_t) -1) {
ret = e_iconv (ic, &inbuf, &inlen, &outbuf, &outlen);
if (ret != (size_t) -1) {
- e_iconv (ic, NULL, 0, &outbuf, &outlen);
+ e_iconv (ic, NULL, NULL, &outbuf, &outlen);
*outbuf = 0;
decoded = g_strdup (outbase);
}
@@ -1332,7 +1332,7 @@ rfc2047_encode_word(GString *outstring,
else
convlen += 3;
}
- if (proclen >= 0 && proclen < i && convlen < (75 - strlen("=?utf-8?q\?\?=")))
+ if (proclen < i && convlen < (75 - strlen("=?utf-8?q\?\?=")))
proclen = i;
/* well, we probably have broken utf8, just copy it anyway what the heck */
if (proclen == -1) {
@@ -1354,7 +1354,7 @@ rfc2047_encode_word(GString *outstring,
inptr += convlen;
} else {
/* make sure we flush out any shift state */
- e_iconv (ic, NULL, 0, &out, &outlen);
+ e_iconv (ic, NULL, NULL, &out, &outlen);
}
inlen -= (inptr - p);
}
@@ -1986,7 +1986,7 @@ header_convert(const char *to, const cha
ret = e_iconv(ic, &in, &inlen, &outbuf, &outlen);
if (ret != (size_t) -1) {
- e_iconv(ic, NULL, 0, &outbuf, &outlen);
+ e_iconv(ic, NULL, NULL, &outbuf, &outlen);
*outbuf = '\0';
result = g_strdup(outbase);
}
@@ -2091,7 +2091,7 @@ camel_header_set_param (struct _camel_he
return NULL;
pn = g_malloc (sizeof (*pn));
- pn->next = 0;
+ pn->next = NULL;
pn->name = g_strdup (name);
pn->value = g_strdup (value);
p->next = pn;
@@ -2246,7 +2246,7 @@ camel_content_type_unref(CamelContentTyp
static char *
header_decode_domain(const char **in)
{
- const char *inptr = *in, *start;
+ const char *inptr = *in;
int go = TRUE;
char *ret;
GString *domain = g_string_new("");
@@ -2258,7 +2258,6 @@ header_decode_domain(const char **in)
domain = g_string_append_c(domain, '[');
inptr++;
header_decode_lwsp(&inptr);
- start = inptr;
while (camel_mime_is_dtext(*inptr)) {
domain = g_string_append_c(domain, *inptr);
inptr++;
@@ -2770,7 +2769,7 @@ camel_header_references_list_append_asis
w = w->next;
n = g_malloc(sizeof(*n));
n->id = ref;
- n->next = 0;
+ n->next = NULL;
w->next = n;
}
Index: camel/camel-multipart.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-multipart.c,v
retrieving revision 1.62
diff -u -p -r1.62 camel-multipart.c
--- camel/camel-multipart.c 31 Aug 2005 04:21:56 -0000 1.62
+++ camel/camel-multipart.c 20 Oct 2005 06:59:43 -0000
@@ -361,7 +361,7 @@ set_boundary (CamelMultipart *multipart,
/* Generate a fairly random boundary string. */
bgen = g_strdup_printf ("%p:%lu:%lu", multipart,
(unsigned long) getpid(),
- (unsigned long) time(0));
+ (unsigned long) time(NULL));
md5_get_digest (bgen, strlen (bgen), digest);
g_free (bgen);
strcpy (bbuf, "=-");
Index: camel/camel-object.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-object.c,v
retrieving revision 1.56
diff -u -p -r1.56 camel-object.c
--- camel/camel-object.c 31 Aug 2005 04:21:56 -0000 1.56
+++ camel/camel-object.c 20 Oct 2005 06:59:44 -0000
@@ -331,8 +331,8 @@ cobject_meta_get(CamelObject *obj, const
CamelObjectMeta *meta;
char *res = NULL;
- g_return_val_if_fail(CAMEL_IS_OBJECT (obj), 0);
- g_return_val_if_fail(name != NULL, 0);
+ g_return_val_if_fail(CAMEL_IS_OBJECT (obj), NULL);
+ g_return_val_if_fail(name != NULL, NULL);
pair = co_metadata_pair(obj, FALSE);
if (pair) {
@@ -1455,7 +1455,6 @@ camel_object_trigger_event(void *vo, con
pair = co_find_pair_ptr(obj->klass, interface_name);
if (pair) {
GPtrArray *interfaces = pair->data;
- int i;
for (i=0;i<interfaces->len;i++) {
hook = co_find_pair(interfaces->pdata[i], name);
@@ -1611,7 +1610,7 @@ void *camel_object_get_ptr(void *vo, Cam
g_return_val_if_fail(CAMEL_IS_OBJECT(o), NULL);
g_return_val_if_fail((tag & CAMEL_ARG_TYPE) == CAMEL_ARG_OBJ
|| (tag & CAMEL_ARG_TYPE) == CAMEL_ARG_STR
- || (tag & CAMEL_ARG_TYPE) == CAMEL_ARG_PTR, 0);
+ || (tag & CAMEL_ARG_TYPE) == CAMEL_ARG_PTR, NULL);
/* woefully inefficient, *shrug */
args.argc = 1;
@@ -1749,8 +1748,8 @@ camel_object_meta_get(void *vo, const ch
{
CamelObject *obj = vo;
- g_return_val_if_fail(CAMEL_IS_OBJECT (obj), 0);
- g_return_val_if_fail(name != NULL, 0);
+ g_return_val_if_fail(CAMEL_IS_OBJECT (obj), NULL);
+ g_return_val_if_fail(name != NULL, NULL);
return obj->klass->meta_get(obj, name);
}
Index: camel/camel-offline-journal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-offline-journal.c,v
retrieving revision 1.5
diff -u -p -r1.5 camel-offline-journal.c
--- camel/camel-offline-journal.c 31 Aug 2005 04:21:56 -0000 1.5
+++ camel/camel-offline-journal.c 20 Oct 2005 06:59:44 -0000
@@ -56,7 +56,7 @@ static CamelObjectClass *parent_class =
CamelType
camel_offline_journal_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (camel_object_get_type (),
Index: camel/camel-partition-table.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-partition-table.c,v
retrieving revision 1.10
diff -u -p -r1.10 camel-partition-table.c
--- camel/camel-partition-table.c 31 Aug 2005 04:21:56 -0000 1.10
+++ camel/camel-partition-table.c 20 Oct 2005 06:59:45 -0000
@@ -249,13 +249,10 @@ int
camel_partition_table_sync(CamelPartitionTable *cpi)
{
CamelBlock *bl, *bn;
- struct _CamelPartitionTablePrivate *p;
int ret = 0;
CAMEL_PARTITION_TABLE_LOCK(cpi, lock);
- p = cpi->priv;
-
if (cpi->blocks) {
bl = (CamelBlock *)cpi->partition.head;
bn = bl->next;
@@ -323,7 +320,6 @@ void camel_partition_table_remove(CamelP
CamelPartitionMapBlock *ptb;
CamelBlock *block, *ptblock;
camel_hash_t hashid;
- camel_key_t keyid = 0;
int index, i;
hashid = hash_key(key);
@@ -348,7 +344,6 @@ void camel_partition_table_remove(CamelP
if (pkb->keys[i].hashid == hashid) {
/* !! need to: lookup and compare string value */
/* get_key() if key == key ... */
- keyid = pkb->keys[i].keyid;
/* remove this key */
pkb->used--;
@@ -857,7 +852,7 @@ camel_key_table_lookup(CamelKeyTable *ki
CamelKeyBlock *kb;
if (keyp)
- *keyp = 0;
+ *keyp = NULL;
if (flags)
*flags = 0;
if (keyid == 0)
@@ -916,7 +911,7 @@ camel_key_table_next(CamelKeyTable *ki,
int index;
if (keyp)
- *keyp = 0;
+ *keyp = NULL;
if (flagsp)
*flagsp = 0;
if (datap)
Index: camel/camel-provider.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-provider.h,v
retrieving revision 1.48
diff -u -p -r1.48 camel-provider.h
--- camel/camel-provider.h 31 Aug 2005 04:21:56 -0000 1.48
+++ camel/camel-provider.h 20 Oct 2005 06:59:45 -0000
@@ -219,7 +219,7 @@ typedef struct _CamelProviderModule Came
struct _CamelProviderModule {
char *path;
GSList *types;
- int loaded:1;
+ guint loaded:1;
};
void camel_provider_init(void);
Index: camel/camel-sasl-digest-md5.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-digest-md5.c,v
retrieving revision 1.27
diff -u -p -r1.27 camel-sasl-digest-md5.c
--- camel/camel-sasl-digest-md5.c 31 Aug 2005 04:21:56 -0000 1.27
+++ camel/camel-sasl-digest-md5.c 20 Oct 2005 06:59:49 -0000
@@ -649,7 +649,7 @@ generate_response (struct _DigestChallen
/* generate the cnonce */
bgen = g_strdup_printf ("%p:%lu:%lu", resp,
(unsigned long) getpid (),
- (unsigned long) time (0));
+ (unsigned long) time (NULL));
md5_get_digest (bgen, strlen (bgen), digest);
g_free (bgen);
/* take our recommended 64 bits of entropy */
Index: camel/camel-sasl-popb4smtp.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-popb4smtp.c,v
retrieving revision 1.8
diff -u -p -r1.8 camel-sasl-popb4smtp.c
--- camel/camel-sasl-popb4smtp.c 31 Aug 2005 04:21:56 -0000 1.8
+++ camel/camel-sasl-popb4smtp.c 20 Oct 2005 06:59:49 -0000
@@ -114,7 +114,7 @@ popb4smtp_challenge (CamelSasl *sasl, GB
}
/* check if we've done it before recently in this session */
- now = time(0);
+ now = time(NULL);
/* need to lock around the whole thing until finished with timep */
Index: camel/camel-search-private.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-search-private.c,v
retrieving revision 1.35
diff -u -p -r1.35 camel-search-private.c
--- camel/camel-search-private.c 31 Aug 2005 04:21:56 -0000 1.35
+++ camel/camel-search-private.c 20 Oct 2005 06:59:49 -0000
@@ -143,7 +143,7 @@ camel_search_build_match_regex (regex_t
if (err != 0) {
/* regerror gets called twice to get the full error string
length to do proper posix error reporting */
- int len = regerror (err, pattern, 0, 0);
+ int len = regerror (err, pattern, NULL, 0);
char *buffer = g_malloc0 (len + 1);
regerror (err, pattern, buffer, len);
Index: camel/camel-session.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-session.h,v
retrieving revision 1.52
diff -u -p -r1.52 camel-session.h
--- camel/camel-session.h 31 Aug 2005 04:21:56 -0000 1.52
+++ camel/camel-session.h 20 Oct 2005 06:59:49 -0000
@@ -66,8 +66,8 @@ struct _CamelSession
char *storage_path;
CamelJunkPlugin *junk_plugin;
- gboolean online:1;
- gboolean check_junk:1;
+ guint online:1;
+ guint check_junk:1;
};
typedef struct _CamelSessionThreadOps CamelSessionThreadOps;
Index: camel/camel-stream-buffer.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-buffer.c,v
retrieving revision 1.28
diff -u -p -r1.28 camel-stream-buffer.c
--- camel/camel-stream-buffer.c 31 Aug 2005 04:21:56 -0000 1.28
+++ camel/camel-stream-buffer.c 20 Oct 2005 06:59:49 -0000
@@ -79,7 +79,7 @@ camel_stream_buffer_init (gpointer objec
sbf->ptr = sbf->buf;
sbf->end = sbf->buf;
sbf->mode = CAMEL_STREAM_BUFFER_READ | CAMEL_STREAM_BUFFER_BUFFER;
- sbf->stream = 0;
+ sbf->stream = NULL;
sbf->linesize = 80;
sbf->linebuf = g_malloc(sbf->linesize);
}
Index: camel/camel-stream-filter.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-filter.c,v
retrieving revision 1.32
diff -u -p -r1.32 camel-stream-filter.c
--- camel/camel-stream-filter.c 31 Aug 2005 04:21:56 -0000 1.32
+++ camel/camel-stream-filter.c 20 Oct 2005 06:59:54 -0000
@@ -50,8 +50,8 @@ struct _CamelStreamFilterPrivate {
char *filtered; /* the filtered data */
size_t filteredlen;
- int last_was_read:1; /* was the last op read or write? */
- int flushed:1; /* were the filters flushed? */
+ guint last_was_read:1; /* was the last op read or write? */
+ guint flushed:1; /* were the filters flushed? */
};
#define READ_PAD (128) /* bytes padded before buffer */
Index: camel/camel-stream-mem.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-mem.c,v
retrieving revision 1.35
diff -u -p -r1.35 camel-stream-mem.c
--- camel/camel-stream-mem.c 31 Aug 2005 04:21:56 -0000 1.35
+++ camel/camel-stream-mem.c 20 Oct 2005 06:59:54 -0000
@@ -71,7 +71,7 @@ camel_stream_mem_init (CamelObject *obje
CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);
stream_mem->owner = FALSE;
- stream_mem->buffer = 0;
+ stream_mem->buffer = NULL;
}
/* could probably be a util method */
Index: camel/camel-tcp-stream-raw.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-tcp-stream-raw.c,v
retrieving revision 1.37
diff -u -p -r1.37 camel-tcp-stream-raw.c
--- camel/camel-tcp-stream-raw.c 31 Aug 2005 04:21:56 -0000 1.37
+++ camel/camel-tcp-stream-raw.c 20 Oct 2005 06:59:54 -0000
@@ -224,7 +224,7 @@ flaky_tcp_read (int fd, char *buffer, si
* Returns a new #CamelTcpStream object
**/
CamelStream *
-camel_tcp_stream_raw_new ()
+camel_tcp_stream_raw_new (void)
{
CamelTcpStreamRaw *stream;
@@ -328,7 +328,7 @@ socket_connect(struct addrinfo *h)
tv.tv_sec = 60 * 4;
tv.tv_usec = 0;
- status = select (fdmax, &rdset, &wrset, 0, &tv);
+ status = select (fdmax, &rdset, &wrset, NULL, &tv);
} while (status == -1 && errno == EINTR);
if (status <= 0) {
Index: camel/camel-text-index.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-text-index.c,v
retrieving revision 1.23
diff -u -p -r1.23 camel-text-index.c
--- camel/camel-text-index.c 31 Aug 2005 04:21:56 -0000 1.23
+++ camel/camel-text-index.c 20 Oct 2005 07:00:06 -0000
@@ -194,7 +194,7 @@ text_index_add_name_to_word(CamelIndex *
rb->words++;
camel_block_file_touch_block(p->blocks, p->blocks->root_block);
} else {
- data = camel_key_table_lookup(p->word_index, wordid, NULL, 0);
+ data = camel_key_table_lookup(p->word_index, wordid, NULL, NULL);
if (data == 0) {
g_warning ("Could not find key entry for word '%s': %s\n",
word, strerror (errno));
Index: camel/providers/groupwise/camel-groupwise-journal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-journal.c,v
retrieving revision 1.3
diff -u -p -r1.3 camel-groupwise-journal.c
--- camel/providers/groupwise/camel-groupwise-journal.c 31 Aug 2005 04:26:07 -0000 1.3
+++ camel/providers/groupwise/camel-groupwise-journal.c 20 Oct 2005 07:00:06 -0000
@@ -64,7 +64,7 @@ static CamelOfflineJournalClass *parent_
CamelType
camel_groupwise_journal_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (camel_offline_journal_get_type (),
Index: camel/providers/groupwise/camel-groupwise-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-provider.c,v
retrieving revision 1.33
diff -u -p -r1.33 camel-groupwise-provider.c
--- camel/providers/groupwise/camel-groupwise-provider.c 31 Aug 2005 04:26:07 -0000 1.33
+++ camel/providers/groupwise/camel-groupwise-provider.c 20 Oct 2005 07:00:06 -0000
@@ -44,7 +44,7 @@ static gint check_equal (char *s1, char
static gint groupwise_url_equal (gconstpointer a, gconstpointer b);
-CamelProviderConfEntry groupwise_conf_entries[] = {
+static CamelProviderConfEntry groupwise_conf_entries[] = {
/* override the labels/defaults of the standard settings */
{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
@@ -98,7 +98,7 @@ static CamelProvider groupwise_provider
/* ... */
};
-CamelServiceAuthType camel_groupwise_password_authtype = {
+static CamelServiceAuthType camel_groupwise_password_authtype = {
N_("Password"),
N_("This option will connect to the GroupWise server using a "
Index: camel/providers/groupwise/camel-groupwise-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-summary.c,v
retrieving revision 1.9
diff -u -p -r1.9 camel-groupwise-summary.c
--- camel/providers/groupwise/camel-groupwise-summary.c 31 Aug 2005 04:26:07 -0000 1.9
+++ camel/providers/groupwise/camel-groupwise-summary.c 20 Oct 2005 07:00:06 -0000
@@ -277,7 +277,6 @@ gw_info_set_flags (CamelMessageInfo *inf
}
return TRUE;
-
}
Index: camel/providers/imap/camel-imap-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-provider.c,v
retrieving revision 1.34
diff -u -p -r1.34 camel-imap-provider.c
--- camel/providers/imap/camel-imap-provider.c 31 Aug 2005 04:26:02 -0000 1.34
+++ camel/providers/imap/camel-imap-provider.c 20 Oct 2005 07:00:06 -0000
@@ -39,7 +39,7 @@ static guint imap_url_hash (gconstpointe
static gint check_equal (char *s1, char *s2);
static gint imap_url_equal (gconstpointer a, gconstpointer b);
-CamelProviderConfEntry imap_conf_entries[] = {
+static CamelProviderConfEntry imap_conf_entries[] = {
{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
N_("Checking for New Mail") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
@@ -92,7 +92,7 @@ static CamelProvider imap_provider = {
/* ... */
};
-CamelServiceAuthType camel_imap_password_authtype = {
+static CamelServiceAuthType camel_imap_password_authtype = {
N_("Password"),
N_("This option will connect to the IMAP server using a "
Index: camel/providers/imap/camel-imap-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-store.c,v
retrieving revision 1.330.2.1
diff -u -p -r1.330.2.1 camel-imap-store.c
--- camel/providers/imap/camel-imap-store.c 10 Oct 2005 06:39:51 -0000 1.330.2.1
+++ camel/providers/imap/camel-imap-store.c 20 Oct 2005 07:00:09 -0000
@@ -537,7 +537,7 @@ connect_to_server (CamelService *service
CamelStream *tcp_stream;
CamelSockOptData sockopt;
gboolean force_imap4 = FALSE;
- int clean_quit = TRUE, ret;
+ int clean_quit = TRUE;
char *buf;
if (ssl_mode != MODE_CLEAR) {
@@ -558,7 +558,7 @@ connect_to_server (CamelService *service
tcp_stream = camel_tcp_stream_raw_new ();
}
- if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
+ if ((camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
if (errno == EINTR)
camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
_("Connection cancelled"));
@@ -1881,7 +1881,6 @@ get_folder_online (CamelStore *store, co
if (parent_real != NULL) {
gboolean need_convert = FALSE;
char *resp, *thisone;
- guint32 flags;
int i;
if (!(response = camel_imap_command (imap_store, NULL, ex, "LIST \"\" %S", parent_real))) {
Index: camel/providers/imap/camel-imap-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-utils.c,v
retrieving revision 1.79
diff -u -p -r1.79 camel-imap-utils.c
--- camel/providers/imap/camel-imap-utils.c 31 Aug 2005 04:26:02 -0000 1.79
+++ camel/providers/imap/camel-imap-utils.c 20 Oct 2005 07:00:11 -0000
@@ -308,7 +308,9 @@ imap_parse_namespace_response (const cha
gboolean
imap_parse_list_response (CamelImapStore *store, const char *buf, int *flags, char *sep, char **folder)
{
+#if 0
gboolean is_lsub = FALSE;
+#endif
const char *word;
size_t len;
@@ -318,10 +320,12 @@ imap_parse_list_response (CamelImapStore
word = imap_next_word (buf);
if (g_ascii_strncasecmp (word, "LIST", 4) && g_ascii_strncasecmp (word, "LSUB", 4))
return FALSE;
-
+
+#if 0
/* check if we are looking at an LSUB response */
if (word[1] == 'S' || word[1] == 's')
is_lsub = TRUE;
+#endif
/* get the flags */
word = imap_next_word (word);
Index: camel/providers/imap4/camel-imap4-command.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-command.c,v
retrieving revision 1.9
diff -u -p -r1.9 camel-imap4-command.c
--- camel/providers/imap4/camel-imap4-command.c 31 Aug 2005 04:26:05 -0000 1.9
+++ camel/providers/imap4/camel-imap4-command.c 20 Oct 2005 07:00:12 -0000
@@ -507,7 +507,6 @@ camel_imap4_command_step (CamelIMAP4Comm
CamelIMAP4Literal *literal;
camel_imap4_token_t token;
unsigned char *linebuf;
- ssize_t nwritten;
size_t len;
g_assert (ic->part != NULL);
@@ -545,7 +544,7 @@ camel_imap4_command_step (CamelIMAP4Comm
linebuf = ic->part->buffer;
len = ic->part->buflen;
- if ((nwritten = camel_stream_write (engine->ostream, linebuf, len)) == -1) {
+ if ((camel_stream_write (engine->ostream, linebuf, len)) == -1) {
camel_exception_setv (&ic->ex, CAMEL_EXCEPTION_SYSTEM,
_("Failed sending command to IMAP server %s: %s"),
engine->url->host, g_strerror (errno));
Index: camel/providers/imap4/camel-imap4-engine.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-engine.c,v
retrieving revision 1.27
diff -u -p -r1.27 camel-imap4-engine.c
--- camel/providers/imap4/camel-imap4-engine.c 31 Aug 2005 04:26:05 -0000 1.27
+++ camel/providers/imap4/camel-imap4-engine.c 20 Oct 2005 07:00:16 -0000
@@ -58,7 +58,7 @@ static CamelObjectClass *parent_class =
CamelType
camel_imap4_engine_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (camel_object_get_type (),
Index: camel/providers/imap4/camel-imap4-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-folder.c,v
retrieving revision 1.46
diff -u -p -r1.46 camel-imap4-folder.c
--- camel/providers/imap4/camel-imap4-folder.c 31 Aug 2005 04:26:05 -0000 1.46
+++ camel/providers/imap4/camel-imap4-folder.c 20 Oct 2005 07:00:18 -0000
@@ -89,7 +89,7 @@ static CamelProperty imap4_prop_list[] =
CamelType
camel_imap4_folder_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (camel_offline_folder_get_type (),
@@ -1009,7 +1009,7 @@ imap4_append_message (CamelFolder *folde
for (i = 0; i < ic->resp_codes->len; i++) {
resp = ic->resp_codes->pdata[i];
if (resp->code == CAMEL_IMAP4_RESP_CODE_TRYCREATE) {
- char *parent_name, *p;
+ char *parent_name;
parent_name = g_alloca (strlen (folder->full_name) + 1);
if (!(p = strrchr (parent_name, '/')))
Index: camel/providers/imap4/camel-imap4-journal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-journal.c,v
retrieving revision 1.5
diff -u -p -r1.5 camel-imap4-journal.c
--- camel/providers/imap4/camel-imap4-journal.c 31 Aug 2005 04:26:05 -0000 1.5
+++ camel/providers/imap4/camel-imap4-journal.c 20 Oct 2005 07:00:18 -0000
@@ -63,7 +63,7 @@ static CamelOfflineJournalClass *parent_
CamelType
camel_imap4_journal_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (camel_offline_journal_get_type (),
Index: camel/providers/imap4/camel-imap4-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-provider.c,v
retrieving revision 1.11
diff -u -p -r1.11 camel-imap4-provider.c
--- camel/providers/imap4/camel-imap4-provider.c 31 Aug 2005 04:26:05 -0000 1.11
+++ camel/providers/imap4/camel-imap4-provider.c 20 Oct 2005 07:00:18 -0000
@@ -31,7 +31,7 @@
#include "camel-imap4-store.h"
-CamelProviderConfEntry imap4_conf_entries[] = {
+static CamelProviderConfEntry imap4_conf_entries[] = {
{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
N_("Checking for new mail") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
@@ -84,7 +84,7 @@ static CamelProvider imap4_provider = {
/* ... */
};
-CamelServiceAuthType camel_imap4_password_authtype = {
+static CamelServiceAuthType camel_imap4_password_authtype = {
N_("Password"),
N_("This option will connect to the IMAPv4rev1 server using a "
Index: camel/providers/imap4/camel-imap4-search.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-search.c,v
retrieving revision 1.6
diff -u -p -r1.6 camel-imap4-search.c
--- camel/providers/imap4/camel-imap4-search.c 31 Aug 2005 04:26:05 -0000 1.6
+++ camel/providers/imap4/camel-imap4-search.c 20 Oct 2005 07:00:18 -0000
@@ -52,7 +52,7 @@ static CamelFolderSearchClass *parent_cl
CamelType
camel_imap4_search_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (camel_folder_search_get_type (),
Index: camel/providers/imap4/camel-imap4-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-store.c,v
retrieving revision 1.53
diff -u -p -r1.53 camel-imap4-store.c
--- camel/providers/imap4/camel-imap4-store.c 31 Aug 2005 04:26:05 -0000 1.53
+++ camel/providers/imap4/camel-imap4-store.c 20 Oct 2005 07:00:20 -0000
@@ -86,7 +86,7 @@ static CamelOfflineStoreClass *parent_cl
CamelType
camel_imap4_store_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (camel_offline_store_get_type (),
@@ -308,7 +308,7 @@ connect_to_server (CamelIMAP4Engine *eng
CamelService *service = engine->service;
CamelStream *tcp_stream;
CamelIMAP4Command *ic;
- int id, ret;
+ int id;
if (ssl_mode != MODE_CLEAR) {
#ifdef HAVE_SSL
@@ -328,7 +328,7 @@ connect_to_server (CamelIMAP4Engine *eng
tcp_stream = camel_tcp_stream_raw_new ();
}
- if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
+ if ((camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
if (errno == EINTR)
camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
_("Connection cancelled"));
@@ -578,7 +578,6 @@ static gboolean
imap4_reconnect (CamelIMAP4Engine *engine, CamelException *ex)
{
CamelService *service = engine->service;
- CamelServiceAuthType *mech;
gboolean reprompt = FALSE;
char *errmsg = NULL;
CamelException lex;
@@ -586,7 +585,7 @@ imap4_reconnect (CamelIMAP4Engine *engin
if (!connect_to_server_wrapper (engine, ex))
return FALSE;
-#define CANT_USE_AUTHMECH (!(mech = g_hash_table_lookup (engine->authtypes, service->url->authmech)))
+#define CANT_USE_AUTHMECH (!(g_hash_table_lookup (engine->authtypes, service->url->authmech)))
if (service->url->authmech && CANT_USE_AUTHMECH) {
/* Oops. We can't AUTH using the requested mechanism */
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
@@ -1350,9 +1349,9 @@ imap4_get_folder_info (CamelStore *store
return fi;
}
#endif
-
+#ifdef USE_FOLDER_INFO_CACHE_LOGIC_FOR_SPEED
check_online:
-
+#endif
if (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)
cmd = "LSUB";
else
Index: camel/providers/imap4/camel-imap4-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-stream.c,v
retrieving revision 1.13
diff -u -p -r1.13 camel-imap4-stream.c
--- camel/providers/imap4/camel-imap4-stream.c 31 Aug 2005 04:26:05 -0000 1.13
+++ camel/providers/imap4/camel-imap4-stream.c 20 Oct 2005 07:00:20 -0000
@@ -58,7 +58,7 @@ static CamelStreamClass *parent_class =
CamelType
camel_imap4_stream_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (CAMEL_STREAM_TYPE,
Index: camel/providers/imap4/camel-imap4-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-summary.c,v
retrieving revision 1.42
diff -u -p -r1.42 camel-imap4-summary.c
--- camel/providers/imap4/camel-imap4-summary.c 31 Aug 2005 04:26:05 -0000 1.42
+++ camel/providers/imap4/camel-imap4-summary.c 20 Oct 2005 07:00:20 -0000
@@ -73,7 +73,7 @@ static CamelFolderSummaryClass *parent_c
CamelType
camel_imap4_summary_get_type (void)
{
- static CamelType type = 0;
+ static CamelType type = NULL;
if (!type) {
type = camel_type_register (CAMEL_FOLDER_SUMMARY_TYPE,
Index: camel/providers/imap4/camel-imap4-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-utils.c,v
retrieving revision 1.16
diff -u -p -r1.16 camel-imap4-utils.c
--- camel/providers/imap4/camel-imap4-utils.c 31 Aug 2005 04:26:05 -0000 1.16
+++ camel/providers/imap4/camel-imap4-utils.c 20 Oct 2005 07:00:23 -0000
@@ -485,7 +485,7 @@ camel_imap4_parse_flags_list (CamelIMAP4
}
-struct {
+static struct {
const char *name;
guint32 flag;
} list_flags[] = {
Index: camel/providers/local/camel-local-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-local-store.c,v
retrieving revision 1.39
diff -u -p -r1.39 camel-local-store.c
--- camel/providers/local/camel-local-store.c 31 Aug 2005 04:26:06 -0000 1.39
+++ camel/providers/local/camel-local-store.c 20 Oct 2005 07:00:23 -0000
@@ -300,8 +300,8 @@ create_folder(CamelStore *store, const c
static int xrename(const char *oldp, const char *newp, const char *prefix, const char *suffix, int missingok, CamelException *ex)
{
struct stat st;
- char *old = g_strconcat(prefix, oldp, suffix, 0);
- char *new = g_strconcat(prefix, newp, suffix, 0);
+ char *old = g_strconcat(prefix, oldp, suffix, NULL);
+ char *new = g_strconcat(prefix, newp, suffix, NULL);
int ret = -1;
int err = 0;
Index: camel/providers/local/camel-maildir-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-maildir-summary.c,v
retrieving revision 1.28
diff -u -p -r1.28 camel-maildir-summary.c
--- camel/providers/local/camel-maildir-summary.c 31 Aug 2005 04:26:06 -0000 1.28
+++ camel/providers/local/camel-maildir-summary.c 20 Oct 2005 07:00:23 -0000
@@ -371,7 +371,7 @@ static char *maildir_summary_next_uid_st
g_free(uid);
sleep(2);
}
- uid = g_strdup_printf("%ld.%d_%u.%s", time(0), getpid(), nextuid, mds->priv->hostname);
+ uid = g_strdup_printf("%ld.%d_%u.%s", time(NULL), getpid(), nextuid, mds->priv->hostname);
name = g_strdup_printf("%s/tmp/%s", cls->folder_path, uid);
retry++;
} while (stat(name, &st) == 0 && retry<3);
Index: camel/providers/local/camel-mbox-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-mbox-store.c,v
retrieving revision 1.42
diff -u -p -r1.42 camel-mbox-store.c
--- camel/providers/local/camel-mbox-store.c 31 Aug 2005 04:26:06 -0000 1.42
+++ camel/providers/local/camel-mbox-store.c 20 Oct 2005 07:00:23 -0000
@@ -402,7 +402,6 @@ xrename(CamelStore *store, const char *o
char *oldpath, *newpath;
struct stat st;
int ret = -1;
- int err = 0;
if (ext != NULL) {
oldpath = camel_local_store_get_meta_path(ls, old_name, ext);
@@ -416,7 +415,6 @@ xrename(CamelStore *store, const char *o
if (missingok && errno == ENOENT) {
ret = 0;
} else {
- err = errno;
ret = -1;
}
} else if (S_ISDIR(st.st_mode)) {
@@ -424,7 +422,6 @@ xrename(CamelStore *store, const char *o
if (rename(oldpath, newpath) == 0 || stat(newpath, &st) == 0) {
ret = 0;
} else {
- err = errno;
ret = -1;
}
} else if (link(oldpath, newpath) == 0 /* and link for files */
@@ -432,12 +429,10 @@ xrename(CamelStore *store, const char *o
if (unlink(oldpath) == 0) {
ret = 0;
} else {
- err = errno;
unlink(newpath);
ret = -1;
}
} else {
- err = errno;
ret = -1;
}
Index: camel/providers/local/camel-mbox-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-mbox-summary.c,v
retrieving revision 1.55
diff -u -p -r1.55 camel-mbox-summary.c
--- camel/providers/local/camel-mbox-summary.c 31 Aug 2005 04:26:06 -0000 1.55
+++ camel/providers/local/camel-mbox-summary.c 20 Oct 2005 07:00:25 -0000
@@ -727,7 +727,7 @@ mbox_summary_sync_quick(CamelMboxSummary
camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
- if (camel_mime_parser_step(mp, 0, 0) != CAMEL_MIME_PARSER_STATE_FROM) {
+ if (camel_mime_parser_step(mp, NULL, NULL) != CAMEL_MIME_PARSER_STATE_FROM) {
g_warning("Expected a From line here, didn't get it");
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
_("Summary and folder mismatch, even after a sync"));
@@ -742,7 +742,7 @@ mbox_summary_sync_quick(CamelMboxSummary
goto error;
}
- if (camel_mime_parser_step(mp, 0, 0) == CAMEL_MIME_PARSER_STATE_FROM_END) {
+ if (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM_END) {
g_warning("camel_mime_parser_step failed (2)");
goto error;
}
@@ -1114,12 +1114,11 @@ static guint32
decode_status(const char *status)
{
const char *p;
- char c;
guint32 flags = 0;
int i;
p = status;
- while ((c = *p++)) {
+ while ((*p++ != NULL)) {
for (i=0;i<sizeof(status_flags)/sizeof(status_flags[0]);i++)
if (status_flags[i].tag == *p)
flags |= status_flags[i].flag;
Index: camel/providers/nntp/camel-nntp-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/camel-nntp-provider.c,v
retrieving revision 1.27
diff -u -p -r1.27 camel-nntp-provider.c
--- camel/providers/nntp/camel-nntp-provider.c 31 Aug 2005 04:26:02 -0000 1.27
+++ camel/providers/nntp/camel-nntp-provider.c 20 Oct 2005 07:00:25 -0000
@@ -37,7 +37,7 @@ static guint nntp_url_hash (gconstpointe
static gint check_equal (char *s1, char *s2);
static gint nntp_url_equal (gconstpointer a, gconstpointer b);
-CamelProviderConfEntry nntp_conf_entries[] = {
+static CamelProviderConfEntry nntp_conf_entries[] = {
{ CAMEL_PROVIDER_CONF_SECTION_START, "folders", NULL,
N_("Folders") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "show_short_notation", NULL,
@@ -68,7 +68,7 @@ static CamelProvider news_provider = {
/* ... */
};
-CamelServiceAuthType camel_nntp_password_authtype = {
+static CamelServiceAuthType camel_nntp_password_authtype = {
N_("Password"),
N_("This option will authenticate with the NNTP server using a "
Index: camel/providers/nntp/camel-nntp-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/camel-nntp-stream.c,v
retrieving revision 1.6
diff -u -p -r1.6 camel-nntp-stream.c
--- camel/providers/nntp/camel-nntp-stream.c 31 Aug 2005 04:26:03 -0000 1.6
+++ camel/providers/nntp/camel-nntp-stream.c 20 Oct 2005 07:00:28 -0000
@@ -339,8 +339,6 @@ camel_nntp_stream_line(CamelNNTPStream *
oe = is->lineend - 1;
o = is->linebuf + oldlen;
}
-
- return -1;
}
/* returns -1 on error, 0 if last lot of data, >0 if more remaining */
Index: camel/providers/pop3/camel-pop3-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/camel-pop3-folder.c,v
retrieving revision 1.70
diff -u -p -r1.70 camel-pop3-folder.c
--- camel/providers/pop3/camel-pop3-folder.c 31 Aug 2005 04:26:03 -0000 1.70
+++ camel/providers/pop3/camel-pop3-folder.c 20 Oct 2005 07:00:28 -0000
@@ -396,7 +396,7 @@ pop3_get_message (CamelFolder *folder, c
CamelPOP3Command *pcr;
CamelPOP3FolderInfo *fi;
char buffer[1];
- int ok, i, last;
+ int i, last;
CamelStream *stream = NULL;
fi = g_hash_table_lookup(pop3_folder->uids_uid, uid);
@@ -422,7 +422,7 @@ pop3_get_message (CamelFolder *folder, c
fi->err = errno;
/* getting error code? */
- ok = fi->cmd->state == CAMEL_POP3_COMMAND_DATA;
+ fi->cmd->state == CAMEL_POP3_COMMAND_DATA;
camel_pop3_engine_command_free(pop3_store->engine, fi->cmd);
fi->cmd = NULL;
@@ -482,7 +482,7 @@ pop3_get_message (CamelFolder *folder, c
fi->err = errno;
/* getting error code? */
- ok = pcr->state == CAMEL_POP3_COMMAND_DATA;
+ pcr->state == CAMEL_POP3_COMMAND_DATA;
camel_pop3_engine_command_free(pop3_store->engine, pcr);
camel_stream_reset(stream);
Index: camel/providers/pop3/camel-pop3-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/camel-pop3-provider.c,v
retrieving revision 1.34
diff -u -p -r1.34 camel-pop3-provider.c
--- camel/providers/pop3/camel-pop3-provider.c 31 Aug 2005 04:26:04 -0000 1.34
+++ camel/providers/pop3/camel-pop3-provider.c 20 Oct 2005 07:00:28 -0000
@@ -34,7 +34,7 @@
#include "camel-sasl.h"
#include "camel-i18n.h"
-CamelProviderConfEntry pop3_conf_entries[] = {
+static CamelProviderConfEntry pop3_conf_entries[] = {
{ CAMEL_PROVIDER_CONF_SECTION_START, "storage", NULL,
N_("Message storage") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "keep_on_server", NULL,
@@ -68,7 +68,7 @@ static CamelProvider pop3_provider = {
/* ... */
};
-CamelServiceAuthType camel_pop3_password_authtype = {
+static const CamelServiceAuthType camel_pop3_password_authtype = {
N_("Password"),
N_("This option will connect to the POP server using a plaintext "
@@ -78,7 +78,7 @@ CamelServiceAuthType camel_pop3_password
TRUE
};
-CamelServiceAuthType camel_pop3_apop_authtype = {
+static const CamelServiceAuthType camel_pop3_apop_authtype = {
"APOP",
N_("This option will connect to the POP server using an encrypted "
Index: camel/providers/pop3/camel-pop3-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/camel-pop3-stream.c,v
retrieving revision 1.5
diff -u -p -r1.5 camel-pop3-stream.c
--- camel/providers/pop3/camel-pop3-stream.c 31 Aug 2005 04:26:04 -0000 1.5
+++ camel/providers/pop3/camel-pop3-stream.c 20 Oct 2005 07:00:28 -0000
@@ -346,8 +346,6 @@ camel_pop3_stream_line(CamelPOP3Stream *
oe = is->lineend - 1;
o = is->linebuf + oldlen;
}
-
- return -1;
}
/* returns -1 on error, 0 if last lot of data, >0 if more remaining */
Index: camel/providers/smtp/camel-smtp-transport.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/smtp/camel-smtp-transport.c,v
retrieving revision 1.169
diff -u -p -r1.169 camel-smtp-transport.c
--- camel/providers/smtp/camel-smtp-transport.c 31 Aug 2005 04:26:04 -0000 1.169
+++ camel/providers/smtp/camel-smtp-transport.c 20 Oct 2005 07:00:29 -0000
@@ -233,7 +233,6 @@ connect_to_server (CamelService *service
CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);
CamelStream *tcp_stream;
char *respbuf = NULL;
- int ret;
if (!CAMEL_SERVICE_CLASS (parent_class)->connect (service, ex))
return FALSE;
@@ -260,7 +259,7 @@ connect_to_server (CamelService *service
tcp_stream = camel_tcp_stream_raw_new ();
}
- if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
+ if ((camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
if (errno == EINTR)
camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
_("Connection cancelled"));
@@ -1045,7 +1044,7 @@ smtp_auth (CamelSmtpTransport *transport
goto lose;
}
- if (FALSE) {
+ if (auth_challenge == FALSE) {
broken_smtp_server:
d(fprintf (stderr, "Your SMTP server's implementation of the %s SASL\n"
"authentication mechanism is broken. Please report this to the\n"
Index: docs/reference/addressbook/libebook/tmpl/e-contact.sgml
===================================================================
RCS file: /cvs/gnome/evolution-data-server/docs/reference/addressbook/libebook/tmpl/e-contact.sgml,v
retrieving revision 1.15
diff -u -p -r1.15 e-contact.sgml
--- docs/reference/addressbook/libebook/tmpl/e-contact.sgml 7 Jun 2005 14:58:57 -0000 1.15
+++ docs/reference/addressbook/libebook/tmpl/e-contact.sgml 20 Oct 2005 07:00:29 -0000
@@ -88,6 +88,11 @@ A convenient way of accessing the contac
</para>
+<!-- ##### ARG EContact:book-uri ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG EContact:business-fax ##### -->
<para>
@@ -570,6 +575,7 @@ A convenient way of accessing the contac
@E_CONTACT_UID:
@E_CONTACT_FILE_AS:
+ E_CONTACT_BOOK_URI:
@E_CONTACT_FULL_NAME:
@E_CONTACT_GIVEN_NAME:
@E_CONTACT_FAMILY_NAME:
Index: docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml
===================================================================
RCS file: /cvs/gnome/evolution-data-server/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml,v
retrieving revision 1.3
diff -u -p -r1.3 e-data-cal-common.sgml
--- docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml 7 Jun 2005 16:58:04 -0000 1.3
+++ docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml 20 Oct 2005 07:00:29 -0000
@@ -89,6 +89,7 @@ e-data-cal-common
@get_default_object:
@get_object:
@get_object_list:
+ get_attachment_list:
@get_timezone:
@add_timezone:
@set_default_timezone:
Index: libedataserver/e-account-list.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-account-list.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-account-list.c
--- libedataserver/e-account-list.c 31 Aug 2005 04:26:10 -0000 1.3
+++ libedataserver/e-account-list.c 20 Oct 2005 07:00:33 -0000
@@ -444,7 +444,6 @@ e_account_list_set_default(EAccountList
const EAccount *
e_account_list_find(EAccountList *accounts, e_account_find_t type, const char *key)
{
- char *val;
EIterator *it;
const EAccount *account = NULL;
@@ -461,7 +460,6 @@ e_account_list_find(EAccountList *accoun
account = (const EAccount *)e_iterator_get (it);
- val = NULL;
switch(type) {
case E_ACCOUNT_FIND_NAME:
found = strcmp(account->name, key) == 0;
Index: libedataserver/e-file-cache.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-file-cache.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-file-cache.c
--- libedataserver/e-file-cache.c 31 Aug 2005 04:26:10 -0000 1.13
+++ libedataserver/e-file-cache.c 20 Oct 2005 07:00:33 -0000
@@ -55,8 +55,9 @@ e_file_cache_set_property (GObject *obje
switch (property_id) {
case PROP_FILENAME :
/* make sure the directory for the cache exists */
- priv->filename = g_strdup ( g_value_get_string (value));
+ priv->filename = g_strdup (g_value_get_string (value));
dirname = g_path_get_dirname (priv->filename);
+ g_free (priv->filename);
result = e_util_mkdir_hier (dirname, 0700);
g_free (dirname);
if (result != 0)
@@ -420,12 +421,8 @@ e_file_cache_add_object (EFileCache *cac
gboolean
e_file_cache_replace_object (EFileCache *cache, const char *key, const char *new_value)
{
- EFileCachePrivate *priv;
-
g_return_val_if_fail (E_IS_FILE_CACHE (cache), FALSE);
g_return_val_if_fail (key != NULL, FALSE);
-
- priv = cache->priv;
if (!e_file_cache_get_object (cache, key))
return FALSE;
Index: libedataserver/e-iconv.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-iconv.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-iconv.c
--- libedataserver/e-iconv.c 18 Aug 2005 00:43:28 -0000 1.3
+++ libedataserver/e-iconv.c 20 Oct 2005 07:00:34 -0000
@@ -64,8 +64,6 @@ typedef struct _EDList {
struct _EDListNode *tailpred;
} EDList;
-#define E_DLIST_INITIALISER(l) { (EDListNode *)&l.tail, 0, (EDListNode *)&l.head }
-
struct _iconv_cache_node {
struct _iconv_cache_node *next;
struct _iconv_cache_node *prev;
@@ -96,7 +94,7 @@ static GHashTable *iconv_charsets = NULL
static char *locale_charset = NULL;
static char *locale_lang = NULL;
-struct {
+static struct {
char *charset;
char *iconv_name;
} known_iconv_charsets[] = {
@@ -163,7 +161,7 @@ struct {
static void e_dlist_init(EDList *v)
{
v->head = (EDListNode *)&v->tail;
- v->tail = 0;
+ v->tail = NULL;
v->tailpred = (EDListNode *)&v->head;
}
Index: libedataserver/e-msgport.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-msgport.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-msgport.c
--- libedataserver/e-msgport.c 31 Aug 2005 04:26:10 -0000 1.4
+++ libedataserver/e-msgport.c 20 Oct 2005 07:00:35 -0000
@@ -48,7 +48,7 @@
void e_dlist_init(EDList *v)
{
v->head = (EDListNode *)&v->tail;
- v->tail = 0;
+ v->tail = NULL;
v->tailpred = (EDListNode *)&v->head;
}
@@ -197,7 +197,7 @@ em_cache_lookup(EMCache *emc, const char
if (n) {
e_dlist_remove((EDListNode *)n);
e_dlist_addhead(&emc->lru_list, (EDListNode *)n);
- n->stamp = time(0);
+ n->stamp = time(NULL);
n->ref_count++;
}
g_mutex_unlock(emc->lock);
@@ -278,7 +278,7 @@ em_cache_add(EMCache *emc, EMCacheNode *
} else {
time_t now;
insert:
- now = time(0);
+ now = time(NULL);
g_hash_table_insert(emc->key_table, n->key, n);
e_dlist_addhead(&emc->lru_list, (EDListNode *)n);
n->stamp = now;
@@ -629,7 +629,7 @@ EThread *e_thread_new(e_thread_t type)
EThread *e;
e = g_malloc0(sizeof(*e));
- pthread_mutex_init(&e->mutex, 0);
+ pthread_mutex_init(&e->mutex, NULL);
e->type = type;
e->server_port = e_msgport_new();
e->id = E_THREAD_NONE;
@@ -674,7 +674,7 @@ void e_thread_destroy(EThread *e)
pthread_mutex_unlock(&e->mutex);
t(printf("Joining thread '%d'\n", id));
- pthread_join(id, 0);
+ pthread_join(id, NULL);
t(printf("Joined thread '%d'!\n", id));
pthread_mutex_lock(&e->mutex);
}
@@ -698,7 +698,7 @@ void e_thread_destroy(EThread *e)
e->id_list = g_list_remove(e->id_list, info);
pthread_mutex_unlock(&e->mutex);
t(printf("Joining thread '%d'\n", info->id));
- pthread_join(info->id, 0);
+ pthread_join(info->id, NULL);
t(printf("Joined thread '%d'!\n", info->id));
pthread_mutex_lock(&e->mutex);
g_free(info);
@@ -1017,11 +1017,11 @@ EMutex *e_mutex_new(e_mutex_t type)
switch (type) {
case E_MUTEX_SIMPLE:
- pthread_mutex_init(&m->mutex, 0);
+ pthread_mutex_init(&m->mutex, NULL);
break;
case E_MUTEX_REC:
- pthread_mutex_init(&m->mutex, 0);
- pthread_cond_init(&m->cond, 0);
+ pthread_mutex_init(&m->mutex, NULL);
+ pthread_cond_init(&m->cond, NULL);
break;
/* read / write ? flags for same? */
}
Index: libedataserver/e-msgport.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-msgport.h,v
retrieving revision 1.3
diff -u -p -r1.3 e-msgport.h
--- libedataserver/e-msgport.h 3 Dec 2004 03:33:06 -0000 1.3
+++ libedataserver/e-msgport.h 20 Oct 2005 07:00:35 -0000
@@ -17,7 +17,7 @@ typedef struct _EDList {
struct _EDListNode *tailpred;
} EDList;
-#define E_DLIST_INITIALISER(l) { (EDListNode *)&l.tail, 0, (EDListNode *)&l.head }
+#define E_DLIST_INITIALISER(l) { (EDListNode *)&l.tail, NULL, (EDListNode *)&l.head }
void e_dlist_init(EDList *v);
EDListNode *e_dlist_addhead(EDList *l, EDListNode *n);
Index: libedataserver/e-sexp.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-sexp.c,v
retrieving revision 1.6
diff -u -p -r1.6 e-sexp.c
--- libedataserver/e-sexp.c 31 Aug 2005 04:26:10 -0000 1.6
+++ libedataserver/e-sexp.c 20 Oct 2005 07:00:36 -0000
@@ -583,7 +583,7 @@ term_eval_castint(struct _ESExp *f, int
r->value.number = argv[0]->value.bool != 0;
break;
case ESEXP_RES_STRING:
- r->value.number = strtoul(argv[0]->value.string, 0, 10);
+ r->value.number = strtoul(argv[0]->value.string, NULL, 10);
break;
default:
e_sexp_result_free(f, r);
@@ -1087,7 +1087,7 @@ e_sexp_finalise(void *o)
e_memchunk_destroy(s->term_chunks);
e_memchunk_destroy(s->result_chunks);
- g_scanner_scope_foreach_symbol(s->scanner, 0, free_symbol, 0);
+ g_scanner_scope_foreach_symbol(s->scanner, 0, free_symbol, NULL);
g_scanner_destroy(s->scanner);
#ifdef E_SEXP_IS_G_OBJECT
Index: libedataserver/e-url.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-url.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-url.c
--- libedataserver/e-url.c 31 Aug 2005 04:26:10 -0000 1.4
+++ libedataserver/e-url.c 20 Oct 2005 07:00:37 -0000
@@ -237,7 +237,7 @@ e_uri_new (const char *uri_string)
semi = memchr (uri_string, ';', end - uri_string);
if (semi) {
if (semi[1]) {
- const char *cur, *p, *eq;
+ const char *cur, *eq;
char *name, *value;
for (cur = semi + 1; cur < end; cur = p + 1) {
Index: servers/groupwise/e-gw-connection.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-connection.c,v
retrieving revision 1.131.2.2
diff -u -p -r1.131.2.2 e-gw-connection.c
--- servers/groupwise/e-gw-connection.c 16 Sep 2005 07:27:02 -0000 1.131.2.2
+++ servers/groupwise/e-gw-connection.c 20 Oct 2005 07:00:40 -0000
@@ -1979,9 +1979,10 @@ e_gw_connection_get_categories (EGwConne
EGwConnectionPrivate *priv;
SoupSoapParameter *param, *subparam, *second_level_child;
char *id, *name;
- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
static GStaticMutex connecting = G_STATIC_MUTEX_INIT;
+ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
+
priv = cnc->priv;
g_static_mutex_lock (&connecting);
@@ -2084,7 +2085,7 @@ e_gw_connection_add_members (EGwConnecti
e_gw_message_write_string_parameter (msg, "container", NULL, group_id);
soup_soap_message_start_element (msg, "members", NULL, NULL);
- for (; member_ids != NULL; member_ids = member_ids = g_list_next (member_ids)) {
+ for (; member_ids != NULL; member_ids = g_list_next (member_ids)) {
soup_soap_message_start_element (msg, "member", NULL, NULL);
e_gw_message_write_string_parameter (msg, "id", NULL, member_ids->data);
soup_soap_message_end_element(msg);
@@ -2128,7 +2129,7 @@ e_gw_connection_remove_members (EGwConne
e_gw_message_write_string_parameter (msg, "container", NULL, group_id);
soup_soap_message_start_element (msg, "members", NULL, NULL);
- for (; member_ids != NULL; member_ids = member_ids = g_list_next (member_ids)) {
+ for (; member_ids != NULL; member_ids = g_list_next (member_ids)) {
soup_soap_message_start_element (msg, "member", NULL, NULL);
e_gw_message_write_string_parameter (msg, "id", NULL, member_ids->data);
soup_soap_message_end_element(msg);
Index: servers/groupwise/e-gw-filter.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-filter.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-gw-filter.c
--- servers/groupwise/e-gw-filter.c 31 Aug 2005 04:26:07 -0000 1.4
+++ servers/groupwise/e-gw-filter.c 20 Oct 2005 07:00:40 -0000
@@ -214,7 +214,7 @@ e_gw_filter_finalize (GObject *object)
filter = E_GW_FILTER (object);
priv = filter->priv;
filter_components = priv->component_list;
- for (; filter_components != NULL; filter_components = filter_components = g_slist_next (filter_components)) {
+ for (; filter_components != NULL; filter_components = g_slist_next (filter_components)) {
component = filter_components->data;
g_free (component->field_name);
g_free (component->field_value);
Index: servers/groupwise/e-gw-item.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-item.c,v
retrieving revision 1.95.2.4
diff -u -p -r1.95.2.4 e-gw-item.c
--- servers/groupwise/e-gw-item.c 3 Oct 2005 12:36:05 -0000 1.95.2.4
+++ servers/groupwise/e-gw-item.c 20 Oct 2005 07:00:43 -0000
@@ -2988,6 +2988,7 @@ e_gw_item_set_calendar_item_elements (EG
soup_soap_message_start_element (msg, "byMonth", NULL, NULL);
max_elements = sizeof (rrule->by_month) / sizeof (rrule->by_month [i]);
/* expand into a sequence of 'month' here */
+ max_elements = sizeof (rrule->by_month) / sizeof (rrule->by_month [i]);
for (i = 0; i <= max_elements && rrule->by_month [i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
/*TODO occurence attribute */
g_sprintf (month, "%d", rrule->by_month [i]);
@@ -3019,8 +3020,8 @@ e_gw_item_set_calendar_item_elements (EG
/*attachments*/
if (priv->attach_list) {
- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
GSList *al ;
+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
for (al = priv->attach_list ; al != NULL ; al = al->next) {
EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
add_attachment_to_soap_message (attachment, msg) ;
Index: servers/groupwise/e-gw-message.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-message.c,v
retrieving revision 1.24
diff -u -p -r1.24 e-gw-message.c
--- servers/groupwise/e-gw-message.c 31 Aug 2005 04:26:07 -0000 1.24
+++ servers/groupwise/e-gw-message.c 20 Oct 2005 07:00:43 -0000
@@ -37,7 +37,7 @@ debug_handler (SoupMessage *msg, gpointe
{
g_print ("%d %s\nSOAP-Debug: %p @ %lu\n",
msg->status_code, msg->reason_phrase,
- msg, time (0));
+ msg, time (NULL));
/* print headers */
soup_message_foreach_header (msg->response_headers, print_header, NULL);
@@ -60,7 +60,7 @@ setup_debug (SoupSoapMessage *msg)
SOUP_MESSAGE (msg)->method, suri->path,
suri->query ? "?" : "",
suri->query ? suri->query : "",
- msg, (unsigned long) time (0));
+ msg, (unsigned long) time (NULL));
/* print message headers */
print_header ("Host", suri->host, NULL);
Index: servers/groupwise/e-gw-recur-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-recur-utils.c,v
retrieving revision 1.2
diff -u -p -r1.2 e-gw-recur-utils.c
--- servers/groupwise/e-gw-recur-utils.c 31 Aug 2005 04:26:07 -0000 1.2
+++ servers/groupwise/e-gw-recur-utils.c 20 Oct 2005 07:00:43 -0000
@@ -25,7 +25,7 @@
#endif
#include "e-gw-recur-utils.h"
-const char *days_of_week[7] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
+static const char *days_of_week[7] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
const char *
e_gw_recur_get_day_of_week (short day)
Index: servers/groupwise/e-gw-sendoptions.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-sendoptions.c,v
retrieving revision 1.5
diff -u -p -r1.5 e-gw-sendoptions.c
--- servers/groupwise/e-gw-sendoptions.c 31 Aug 2005 04:26:07 -0000 1.5
+++ servers/groupwise/e-gw-sendoptions.c 20 Oct 2005 07:00:43 -0000
@@ -626,7 +626,7 @@ e_gw_sendoptions_form_message_to_modify
}
EGwSendOptions *
-e_gw_sendoptions_new ()
+e_gw_sendoptions_new (void)
{
EGwSendOptions *opts;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
