Cleanups for e-d-s/camel
Kjartan Maraas <[email protected]>
| Newsgroups | gmane.comp.gnome.evolution.patches |
|---|---|
| Message-ID | <[email protected]> |
Here's a patch that tries to deal with a bunch of warnings from
icc/sparse/gcc.
Cheers
Kjartan
Index: camel-block-file.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-block-file.c,v
retrieving revision 1.21
diff -u -p -r1.21 camel-block-file.c
--- camel-block-file.c 30 Nov 2005 09:54:54 -0000 1.21
+++ camel-block-file.c 10 Apr 2006 12:28:37 -0000
@@ -85,12 +85,9 @@ block_file_validate_root(CamelBlockFile
{
struct stat st;
CamelBlockRoot *br;
- int s;
br = bs->root;
- s = fstat(bs->fd, &st);
-
d(printf("Validate root: '%s'\n", bs->path));
d(printf("version: %.8s (%.8s)\n", bs->root->version, bs->version));
d(printf("block size: %d (%d)%s\n", br->block_size, bs->block_size,
@@ -218,7 +215,7 @@ camel_block_file_finalise(CamelBlockFile
bn = bl->next;
while (bn) {
if (bl->refcount != 0)
- g_warning("Block '%d' still referenced", bl->id);
+ g_warning("Block '%u' still referenced", bl->id);
g_free(bl);
bl = bn;
bn = bn->next;
Index: camel-charset-map-private.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-charset-map-private.h,v
retrieving revision 1.8
diff -u -p -r1.8 camel-charset-map-private.h
--- camel-charset-map-private.h 6 Apr 2006 14:24:25 -0000 1.8
+++ camel-charset-map-private.h 10 Apr 2006 12:28:37 -0000
@@ -564,38 +564,38 @@ static const struct {
const unsigned char *bits0;
const unsigned char *bits1;
} camel_charmap[256] = {
- { m000, m001, }, { m010, m011, }, { m020, 0, }, { m030, 0, }, { m040, m041, }, { m050, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { m200, m201, }, { m210, m211, }, { m220, 0, }, { m230, 0, }, { 0, 0, }, { m250, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
- { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
+ { m000, m001, }, { m010, m011, }, { m020, NULL, }, { m030, NULL, }, { m040, m041, }, { m050, NULL, }, { NULL, NULL, }, { NULL, NULL, },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { m200, m201, }, { m210, m211, }, { m220, NULL, }, { m230, NULL, }, { NULL, NULL }, { m250, NULL, }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
+ { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
};
static const struct {
Index: camel-charset-map.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-charset-map.c,v
retrieving revision 1.46
diff -u -p -r1.46 camel-charset-map.c
--- camel-charset-map.c 6 Apr 2006 14:24:25 -0000 1.46
+++ camel-charset-map.c 10 Apr 2006 12:28:37 -0000
@@ -224,14 +224,14 @@ camel_charset_step (CamelCharset *cc, co
{
register unsigned int mask;
register int level;
- const unsigned char *inptr = in, *inend = in+len;
+ const char *inptr = in, *inend = in+len;
register guint32 c;
mask = cc->mask;
level = cc->level;
/* check what charset a given string will fit in */
- while ( (c = camel_utf8_getc_limit(&inptr, inend)) != 0xffff) {
+ while ( (c = camel_utf8_getc_limit((const unsigned char **)&inptr, (const unsigned char *)inend)) != 0xffff) {
if (c < 0xffff) {
mask &= charset_mask(c);
Index: camel-exception.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-exception.c,v
retrieving revision 1.32
diff -u -p -r1.32 camel-exception.c
--- camel-exception.c 2 Dec 2005 08:54:44 -0000 1.32
+++ camel-exception.c 10 Apr 2006 12:28:37 -0000
@@ -161,7 +161,7 @@ camel_exception_set (CamelException *ex,
const char *desc)
{
if (camel_debug("exception"))
- printf("CamelException.set(%p, %d, '%s')\n", ex, id, desc);
+ printf("CamelException.set(%p, %u, '%s')\n", ex, id, desc);
if (!ex)
return;
@@ -212,7 +212,7 @@ camel_exception_setv (CamelException *ex
va_end (args);
if (camel_debug("exception"))
- printf("CamelException.setv(%p, %d, '%s')\n", ex, id, desc);
+ printf("CamelException.setv(%p, %u, '%s')\n", ex, id, desc);
if (!ex) {
g_free(desc);
Index: camel-filter-driver.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-filter-driver.c,v
retrieving revision 1.95
diff -u -p -r1.95 camel-filter-driver.c
--- camel-filter-driver.c 13 Dec 2005 04:37:10 -0000 1.95
+++ camel-filter-driver.c 10 Apr 2006 12:28:38 -0000
@@ -1145,7 +1145,6 @@ camel_filter_driver_filter_mbox (CamelFi
struct stat st;
int status;
off_t last = 0;
- int ret = -1;
fd = g_open (mbox, O_RDONLY|O_BINARY, 0);
if (fd == -1) {
@@ -1210,7 +1209,7 @@ camel_filter_driver_filter_mbox (CamelFi
report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));
- ret = 0;
+ return 0;
fail:
g_free (source_url);
if (fd != -1)
Index: camel-folder-search.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-folder-search.c,v
retrieving revision 1.76
diff -u -p -r1.76 camel-folder-search.c
--- camel-folder-search.c 25 Jan 2006 08:28:32 -0000 1.76
+++ camel-folder-search.c 10 Apr 2006 12:28:38 -0000
@@ -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-folder-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-folder-summary.c,v
retrieving revision 1.147
diff -u -p -r1.147 camel-folder-summary.c
--- camel-folder-summary.c 2 Feb 2006 05:38:25 -0000 1.147
+++ camel-folder-summary.c 10 Apr 2006 12:28:38 -0000
@@ -1852,11 +1852,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));
@@ -1976,7 +1974,6 @@ summary_build_content_info(CamelFolderSu
char *buffer;
CamelMessageContentInfo *info = NULL;
CamelContentType *ct;
- int body;
int enc_id = -1, chr_id = -1, html_id = -1, idx_id = -1;
struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
CamelMimeFilterCharset *mfc;
@@ -1986,7 +1983,6 @@ summary_build_content_info(CamelFolderSu
/* start of this part */
state = camel_mime_parser_step(mp, &buffer, &len);
- body = camel_mime_parser_tell(mp);
if (s->build_content)
info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new_from_parser(s, mp);
@@ -2516,7 +2512,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-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-folder.c,v
retrieving revision 1.213
diff -u -p -r1.213 camel-folder.c
--- camel-folder.c 13 Dec 2005 13:34:16 -0000 1.213
+++ camel-folder.c 10 Apr 2006 12:28:38 -0000
@@ -1648,14 +1648,14 @@ filter_filter(CamelSession *session, Cam
camel_operation_start (NULL, _("Learning junk"));
for (i = 0; i < m->junk->len; i ++) {
- CamelMimeMessage *msg = camel_folder_get_message(m->folder, m->junk->pdata[i], NULL);
+ CamelMimeMessage *mime_msg = camel_folder_get_message(m->folder, m->junk->pdata[i], NULL);
int pc = 100 * i / m->junk->len;
camel_operation_progress(NULL, pc);
- if (msg) {
- camel_junk_plugin_report_junk (csp, msg);
- camel_object_unref (msg);
+ if (mime_msg) {
+ camel_junk_plugin_report_junk (csp, mime_msg);
+ camel_object_unref (mime_msg);
}
}
camel_operation_end (NULL);
@@ -1664,14 +1664,14 @@ filter_filter(CamelSession *session, Cam
if (m->notjunk) {
camel_operation_start (NULL, _("Learning non-junk"));
for (i = 0; i < m->notjunk->len; i ++) {
- CamelMimeMessage *msg = camel_folder_get_message(m->folder, m->notjunk->pdata[i], NULL);
+ CamelMimeMessage *mime_msg = camel_folder_get_message(m->folder, m->notjunk->pdata[i], NULL);
int pc = 100 * i / m->notjunk->len;
camel_operation_progress(NULL, pc);
- if (msg) {
- camel_junk_plugin_report_notjunk (csp, msg);
- camel_object_unref (msg);
+ if (mime_msg) {
+ camel_junk_plugin_report_notjunk (csp, mime_msg);
+ camel_object_unref (mime_msg);
}
}
camel_operation_end (NULL);
Index: camel-gpg-context.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-gpg-context.c,v
retrieving revision 1.78
diff -u -p -r1.78 camel-gpg-context.c
--- camel-gpg-context.c 20 Mar 2006 13:53:01 -0000 1.78
+++ camel-gpg-context.c 10 Apr 2006 12:28:38 -0000
@@ -404,7 +404,7 @@ gpg_ctx_get_diagnostics (struct _GpgCtx
g_byte_array_append (gpg->diagbuf, "", 1);
}
- return gpg->diagbuf->data;
+ return (const char *)gpg->diagbuf->data;
}
static void
Index: camel-http-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-http-stream.c,v
retrieving revision 1.21
diff -u -p -r1.21 camel-http-stream.c
--- camel-http-stream.c 15 Sep 2005 12:33:22 -0000 1.21
+++ camel-http-stream.c 10 Apr 2006 12:28:38 -0000
@@ -326,7 +326,7 @@ http_get_headers (CamelHttpStream *http)
break;
default:
- g_warning ("Invalid state encountered???: %d", camel_mime_parser_state (http->parser));
+ g_warning ("Invalid state encountered???: %u", camel_mime_parser_state (http->parser));
}
err = camel_mime_parser_errno (http->parser);
@@ -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-internet-address.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-internet-address.c,v
retrieving revision 1.34
diff -u -p -r1.34 camel-internet-address.c
--- camel-internet-address.c 31 Aug 2005 04:21:56 -0000 1.34
+++ camel-internet-address.c 10 Apr 2006 12:28:38 -0000
@@ -459,7 +459,7 @@ append:
char *
camel_internet_address_encode_address(int *inlen, const char *real, const char *addr)
{
- char *name = camel_header_encode_phrase(real);
+ char *name = camel_header_encode_phrase((const unsigned char *)real);
char *ret = NULL;
int len = 0;
GString *out = g_string_new("");
Index: 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-list-utils.c 31 Aug 2005 04:21:56 -0000 1.3
+++ camel-list-utils.c 10 Apr 2006 12:28:38 -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-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-lock-helper.c 31 Aug 2005 04:21:56 -0000 1.7
+++ camel-lock-helper.c 10 Apr 2006 12:28:38 -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-lock.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-lock.c,v
retrieving revision 1.20
diff -u -p -r1.20 camel-lock.c
--- camel-lock.c 13 Dec 2005 04:50:18 -0000 1.20
+++ camel-lock.c 10 Apr 2006 12:28:38 -0000
@@ -141,7 +141,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-mime-filter-basic.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-basic.c,v
retrieving revision 1.22
diff -u -p -r1.22 camel-mime-filter-basic.c
--- camel-mime-filter-basic.c 6 Dec 2005 04:21:54 -0000 1.22
+++ camel-mime-filter-basic.c 10 Apr 2006 12:28:38 -0000
@@ -138,7 +138,7 @@ complete(CamelMimeFilter *mf, char *in,
}
break;
default:
- g_warning("unknown type %d in CamelMimeFilterBasic", f->type);
+ g_warning("unknown type %u in CamelMimeFilterBasic", f->type);
goto donothing;
}
@@ -236,7 +236,7 @@ filter(CamelMimeFilter *mf, char *in, si
}
break;
default:
- g_warning("unknown type %d in CamelMimeFilterBasic", f->type);
+ g_warning("unknown type %u in CamelMimeFilterBasic", f->type);
goto donothing;
}
@@ -291,7 +291,7 @@ camel_mime_filter_basic_new_type(CamelMi
new->type = type;
break;
default:
- g_warning("Invalid type of CamelMimeFilterBasic requested: %d", type);
+ g_warning("Invalid type of CamelMimeFilterBasic requested: %u", type);
new = NULL;
break;
}
Index: camel-mime-filter-gzip.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-gzip.c,v
retrieving revision 1.3
diff -u -p -r1.3 camel-mime-filter-gzip.c
--- camel-mime-filter-gzip.c 31 Aug 2005 04:21:56 -0000 1.3
+++ camel-mime-filter-gzip.c 10 Apr 2006 12:28:39 -0000
@@ -205,12 +205,12 @@ gzip_filter (CamelMimeFilter *filter, ch
fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg);
if (flush == Z_FULL_FLUSH) {
- size_t outlen;
+ size_t outlength;
- outlen = filter->outsize - priv->stream->avail_out;
- camel_mime_filter_set_size (filter, outlen + (priv->stream->avail_in * 2) + 12, TRUE);
- priv->stream->avail_out = filter->outsize - outlen;
- priv->stream->next_out = filter->outbuf + outlen;
+ outlength = filter->outsize - priv->stream->avail_out;
+ camel_mime_filter_set_size (filter, outlength + (priv->stream->avail_in * 2) + 12, TRUE);
+ priv->stream->avail_out = filter->outsize - outlength;
+ priv->stream->next_out = filter->outbuf + outlength;
if (priv->stream->avail_in == 0) {
guint32 val;
@@ -358,17 +358,17 @@ gunzip_filter (CamelMimeFilter *filter,
fprintf (stderr, "gunzip: %d: %s\n", retval, priv->stream->msg);
if (flush == Z_FULL_FLUSH) {
- size_t outlen;
+ size_t outlength;
if (priv->stream->avail_in == 0) {
/* FIXME: extract & compare calculated crc32 and isize values? */
break;
}
- outlen = filter->outsize - priv->stream->avail_out;
- camel_mime_filter_set_size (filter, outlen + (priv->stream->avail_in * 2) + 12, TRUE);
- priv->stream->avail_out = filter->outsize - outlen;
- priv->stream->next_out = filter->outbuf + outlen;
+ outlength = filter->outsize - priv->stream->avail_out;
+ camel_mime_filter_set_size (filter, outlength + (priv->stream->avail_in * 2) + 12, TRUE);
+ priv->stream->avail_out = filter->outsize - outlength;
+ priv->stream->next_out = filter->outbuf + outlength;
} else {
priv->stream->avail_in += 8;
Index: 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-mime-filter-html.c 31 Aug 2005 04:21:56 -0000 1.7
+++ camel-mime-filter-html.c 10 Apr 2006 12:28:39 -0000
@@ -126,15 +126,15 @@ run(CamelMimeFilter *mf, char *in, size_
camel_html_parser_set_data(f->priv->ctxt, in, len, last);
do {
const char *data;
- int len;
+ int length;
- state = camel_html_parser_step(f->priv->ctxt, &data, &len);
+ state = camel_html_parser_step(f->priv->ctxt, &data, &length);
switch(state) {
case CAMEL_HTML_PARSER_DATA:
case CAMEL_HTML_PARSER_ENT:
- memcpy(outp, data, len);
- outp += len;
+ memcpy(outp, data, length);
+ outp += length;
break;
case CAMEL_HTML_PARSER_ELEMENT:
/* FIXME: do some whitespace processing here */
Index: 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-mime-filter-linewrap.c 31 Aug 2005 04:21:56 -0000 1.6
+++ camel-mime-filter-linewrap.c 10 Apr 2006 12:28:39 -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-mime-filter-tohtml.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-tohtml.c,v
retrieving revision 1.21
diff -u -p -r1.21 camel-mime-filter-tohtml.c
--- camel-mime-filter-tohtml.c 21 Feb 2006 12:04:46 -0000 1.21
+++ camel-mime-filter-tohtml.c 10 Apr 2006 12:28:39 -0000
@@ -171,7 +171,7 @@ writeln (CamelMimeFilter *filter, const
outptr = check_size (filter, outptr, outend, 16);
- u = camel_utf8_getc_limit ((const unsigned char **) &inptr, inend);
+ u = camel_utf8_getc_limit ((const unsigned char **) &inptr, (const unsigned char *) inend);
switch (u) {
case 0xffff:
g_warning("Truncated utf8 buffer");
Index: 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-mime-filter-yenc.c 31 Aug 2005 04:21:56 -0000 1.4
+++ camel-mime-filter-yenc.c 10 Apr 2006 12:28:39 -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 const unsigned 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 const unsigned char *inptr;
register unsigned char *outptr;
const unsigned char *inend;
register int already;
Index: camel-mime-message.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-message.c,v
retrieving revision 1.137
diff -u -p -r1.137 camel-mime-message.c
--- camel-mime-message.c 1 Dec 2005 11:50:59 -0000 1.137
+++ camel-mime-message.c 10 Apr 2006 12:28:39 -0000
@@ -600,7 +600,7 @@ construct_from_parser (CamelMimePart *dw
case CAMEL_MIME_PARSER_STATE_MESSAGE_END:
break;
default:
- g_error ("Bad parser state: Expecing MESSAGE_END or EOF or EOM, got: %d", camel_mime_parser_state (mp));
+ g_error ("Bad parser state: Expecing MESSAGE_END or EOF or EOM, got: %u", camel_mime_parser_state (mp));
camel_mime_parser_unstep (mp);
return -1;
}
@@ -762,9 +762,9 @@ message_foreach_part_rec (CamelMimeMessa
if (CAMEL_IS_MULTIPART (containee)) {
parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
for (i = 0; go && i < parts; i++) {
- CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
+ CamelMimePart *mpart = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
- go = message_foreach_part_rec (msg, part, callback, data);
+ go = message_foreach_part_rec (msg, mpart, callback, data);
}
} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
go = message_foreach_part_rec (msg, (CamelMimePart *)containee, callback, data);
@@ -1176,9 +1176,9 @@ cmm_dump_rec(CamelMimeMessage *msg, Came
if (CAMEL_IS_MULTIPART(containee)) {
parts = camel_multipart_get_number((CamelMultipart *)containee);
for (i = 0; go && i < parts; i++) {
- CamelMimePart *part = camel_multipart_get_part((CamelMultipart *)containee, i);
+ CamelMimePart *mpart = camel_multipart_get_part((CamelMultipart *)containee, i);
- cmm_dump_rec(msg, part, body, depth+2);
+ cmm_dump_rec(msg, mpart, body, depth+2);
}
} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
cmm_dump_rec(msg, (CamelMimePart *)containee, body, depth+2);
Index: camel-mime-parser.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-parser.c,v
retrieving revision 1.67
diff -u -p -r1.67 camel-mime-parser.c
--- camel-mime-parser.c 30 Nov 2005 09:54:54 -0000 1.67
+++ camel-mime-parser.c 10 Apr 2006 12:28:39 -0000
@@ -370,7 +370,7 @@ byte_array_to_string(GByteArray *array)
if (array->len == 0 || array->data[array->len-1] != '\0')
g_byte_array_append(array, "", 1);
- return array->data;
+ return (const char *)array->data;
}
/**
@@ -1151,11 +1151,11 @@ header_append_mempool(struct _header_sca
if (headerlen > 0) { \
if (headerlen >= (s->outend - s->outptr)) { \
register char *outnew; \
- register int len = ((s->outend - s->outbuf)+headerlen)*2+1; \
- outnew = g_realloc(s->outbuf, len); \
+ register int length = ((s->outend - s->outbuf)+headerlen)*2+1; \
+ outnew = g_realloc(s->outbuf, length); \
s->outptr = s->outptr - s->outbuf + outnew; \
s->outbuf = outnew; \
- s->outend = outnew + len; \
+ s->outend = outnew + length; \
} \
if (start[headerlen-1] == '\r') \
headerlen--; \
@@ -1762,7 +1762,7 @@ tail_recurse:
return;
default:
- g_warning("Invalid state in camel-mime-parser: %d", s->state);
+ g_warning("Invalid state in camel-mime-parser: %u", s->state);
break;
}
Index: camel-mime-part-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-part-utils.c,v
retrieving revision 1.103
diff -u -p -r1.103 camel-mime-part-utils.c
--- camel-mime-part-utils.c 6 Dec 2005 04:21:54 -0000 1.103
+++ camel-mime-part-utils.c 10 Apr 2006 12:28:39 -0000
@@ -120,7 +120,7 @@ camel_mime_part_construct_content_from_p
d(printf("Created multi-part\n"));
break;
default:
- g_warning("Invalid state encountered???: %d", camel_mime_parser_state (mp));
+ g_warning("Invalid state encountered???: %u", camel_mime_parser_state (mp));
}
if (content) {
Index: camel-mime-part.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-part.c,v
retrieving revision 1.170
diff -u -p -r1.170 camel-mime-part.c
--- camel-mime-part.c 15 Sep 2005 17:35:45 -0000 1.170
+++ camel-mime-part.c 10 Apr 2006 12:28:39 -0000
@@ -961,7 +961,7 @@ construct_from_parser (CamelMimePart *mi
camel_mime_part_construct_content_from_parser (mime_part, mp);
break;
default:
- g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp));
+ g_warning("Invalid state encountered???: %u", camel_mime_parser_state(mp));
}
d(printf("mime_part::construct_from_parser() leaving\n"));
Index: camel-mime-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-utils.c,v
retrieving revision 1.236
diff -u -p -r1.236 camel-mime-utils.c
--- camel-mime-utils.c 20 Mar 2006 16:36:41 -0000 1.236
+++ camel-mime-utils.c 10 Apr 2006 12:28:40 -0000
@@ -2258,7 +2258,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("");
@@ -2270,7 +2270,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++;
@@ -3242,7 +3241,7 @@ header_encode_param (const unsigned char
g_string_free (out, FALSE);
*encoded = TRUE;
- return outbuf;
+ return (char *)outbuf;
}
void
@@ -4070,23 +4069,23 @@ camel_header_raw_check_mailing_list(stru
match[j].rm_eo = -1;
}
if (v != NULL && regexec (&mail_list_magic[i].regex, v, 3, match, 0) == 0 && match[1].rm_so != -1) {
- char *list;
+ char *mlist;
int len1, len2;
len1 = match[1].rm_eo - match[1].rm_so;
len2 = match[2].rm_eo - match[2].rm_so;
- list = g_malloc(len1+len2+2);
- memcpy(list, v + match[1].rm_so, len1);
+ mlist = g_malloc(len1+len2+2);
+ memcpy(mlist, v + match[1].rm_so, len1);
if (len2) {
- list[len1] = '@';
- memcpy(list+len1+1, v+match[2].rm_so, len2);
- list[len1+len2+1]=0;
+ mlist[len1] = '@';
+ memcpy(mlist+len1+1, v+match[2].rm_so, len2);
+ mlist[len1+len2+1]=0;
} else {
- list[len1] = 0;
+ mlist[len1] = 0;
}
- return list;
+ return mlist;
}
}
Index: camel-multipart-signed.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-multipart-signed.c,v
retrieving revision 1.31
diff -u -p -r1.31 camel-multipart-signed.c
--- camel-multipart-signed.c 6 Dec 2005 04:21:54 -0000 1.31
+++ camel-multipart-signed.c 10 Apr 2006 12:28:40 -0000
@@ -218,7 +218,7 @@ skip_content(CamelMimeParser *cmp)
skip_content(cmp);
break;
default:
- g_warning("Invalid state encountered???: %d", camel_mime_parser_state(cmp));
+ g_warning("Invalid state encountered???: %u", camel_mime_parser_state(cmp));
}
return 0;
@@ -233,7 +233,6 @@ parse_content(CamelMultipartSigned *mps)
const char *boundary;
char *buf;
size_t len;
- off_t head = -1, tail = -1;
int state;
boundary = camel_multipart_get_boundary(mp);
@@ -264,7 +263,6 @@ parse_content(CamelMultipartSigned *mps)
while ((state = camel_mime_parser_step(cmp, &buf, &len)) != CAMEL_MIME_PARSER_STATE_MULTIPART_END) {
if (mps->start1 == -1) {
- head = camel_mime_parser_tell_start_boundary(cmp);
mps->start1 = camel_mime_parser_tell_start_headers(cmp);
} else if (mps->start2 == -1) {
mps->start2 = camel_mime_parser_tell_start_headers(cmp);
@@ -284,7 +282,6 @@ parse_content(CamelMultipartSigned *mps)
if (state == CAMEL_MIME_PARSER_STATE_MULTIPART_END) {
mps->end2 = camel_mime_parser_tell_start_boundary(cmp);
- tail = camel_mime_parser_tell(cmp);
camel_multipart_set_preface(mp, camel_mime_parser_preface(cmp));
camel_multipart_set_postface(mp, camel_mime_parser_postface(cmp));
Index: camel-object.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-object.c,v
retrieving revision 1.59
diff -u -p -r1.59 camel-object.c
--- camel-object.c 2 Feb 2006 05:38:25 -0000 1.59
+++ camel-object.c 10 Apr 2006 12:28:40 -0000
@@ -1353,7 +1353,7 @@ camel_object_remove_event(void *vo, unsi
g_return_if_fail (id != 0);
if (obj->hooks == NULL) {
- g_warning("camel_object_unhook_event: trying to unhook `%d` from an instance of `%s' with no hooks",
+ g_warning("camel_object_unhook_event: trying to unhook `%u` from an instance of `%s' with no hooks",
id, obj->klass->name);
return;
}
@@ -1383,7 +1383,7 @@ camel_object_remove_event(void *vo, unsi
}
camel_object_unget_hooks(obj);
- g_warning("camel_object_unhook_event: cannot find hook id %d in instance of `%s'",
+ g_warning("camel_object_unhook_event: cannot find hook id %u in instance of `%s'",
id, obj->klass->name);
}
@@ -1458,7 +1458,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);
Index: 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-partition-table.c 31 Aug 2005 04:21:56 -0000 1.10
+++ camel-partition-table.c 10 Apr 2006 12:28:40 -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--;
Index: 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-provider.h 31 Aug 2005 04:21:56 -0000 1.48
+++ camel-provider.h 10 Apr 2006 12:28:40 -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-sasl-digest-md5.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-digest-md5.c,v
retrieving revision 1.28
diff -u -p -r1.28 camel-sasl-digest-md5.c
--- camel-sasl-digest-md5.c 6 Dec 2005 04:21:54 -0000 1.28
+++ camel-sasl-digest-md5.c 10 Apr 2006 12:28:40 -0000
@@ -764,7 +764,7 @@ digest_response (struct _DigestResponse
if (resp->maxbuf > 0) {
g_byte_array_append (buffer, ",maxbuf=", 8);
- buf = g_strdup_printf ("%d", resp->maxbuf);
+ buf = g_strdup_printf ("%u", resp->maxbuf);
g_byte_array_append (buffer, buf, strlen (buf));
g_free (buf);
}
Index: camel-sasl-ntlm.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-ntlm.c,v
retrieving revision 1.5
diff -u -p -r1.5 camel-sasl-ntlm.c
--- camel-sasl-ntlm.c 6 Dec 2005 04:21:54 -0000 1.5
+++ camel-sasl-ntlm.c 10 Apr 2006 12:28:40 -0000
@@ -526,9 +526,7 @@ static guint32 Spbox[8][64] = {
}
/* Encrypt or decrypt a block of data in ECB mode */
static void
-des(ks,block)
-guint32 ks[16][2]; /* Key schedule */
-unsigned char block[8]; /* Data block */
+des(guint32 ks[16][2],unsigned char block[8])
{
guint32 left,right,work;
@@ -663,10 +661,7 @@ static int bytebit[] = {
* depending on the value of "decrypt"
*/
static void
-deskey(k,key,decrypt)
-DES_KS k; /* Key schedule array */
-unsigned char *key; /* 64 bits (will use only 56) */
-int decrypt; /* 0 = encrypt, 1 = decrypt */
+deskey(DES_KS k, unsigned char *key, int decrypt)
{
unsigned char pc1m[56]; /* place to modify pc1 into */
unsigned char pcr[56]; /* place to rotate pc1 into */
Index: camel-search-private.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-search-private.c,v
retrieving revision 1.37
diff -u -p -r1.37 camel-search-private.c
--- camel-search-private.c 5 Apr 2006 03:28:19 -0000 1.37
+++ camel-search-private.c 10 Apr 2006 12:28:40 -0000
@@ -281,7 +281,7 @@ camel_ustrstrcase (const char *haystack,
}
if (nuni + npos == puni)
- return p;
+ return (const char *)p;
}
}
Index: camel-session.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-session.h,v
retrieving revision 1.54
diff -u -p -r1.54 camel-session.h
--- camel-session.h 20 Mar 2006 13:53:01 -0000 1.54
+++ camel-session.h 10 Apr 2006 12:28:41 -0000
@@ -67,9 +67,9 @@ struct _CamelSession
char *storage_path;
CamelJunkPlugin *junk_plugin;
- gboolean online:1;
- gboolean check_junk:1;
- gboolean network_state:1;
+ guint online:1;
+ guint check_junk:1;
+ guint network_state:1;
};
typedef struct _CamelSessionThreadOps CamelSessionThreadOps;
Index: camel-smime-context.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-smime-context.c,v
retrieving revision 1.42
diff -u -p -r1.42 camel-smime-context.c
--- camel-smime-context.c 6 Dec 2005 04:21:55 -0000 1.42
+++ camel-smime-context.c 10 Apr 2006 12:28:41 -0000
@@ -665,7 +665,7 @@ sm_verify(CamelCipherContext *context, C
NSSCMSDecoderContext *dec;
NSSCMSMessage *cmsg;
CamelStreamMem *mem;
- CamelStream *constream;
+ CamelStream *constream = NULL;
CamelCipherValidity *valid = NULL;
CamelContentType *ct;
const char *tmp;
Index: camel-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-store.c,v
retrieving revision 1.172
diff -u -p -r1.172 camel-store.c
--- camel-store.c 6 Dec 2005 04:21:55 -0000 1.172
+++ camel-store.c 10 Apr 2006 12:28:41 -0000
@@ -289,7 +289,7 @@ camel_store_get_folder (CamelStore *stor
if (camel_debug_start(":store")) {
char *u = camel_url_to_string(((CamelService *)store)->url, CAMEL_URL_HIDE_PASSWORD);
- printf("CamelStore('%s'):get_folder('%s', %d) = %p\n", u, folder_name, flags, folder);
+ printf("CamelStore('%s'):get_folder('%s', %u) = %p\n", u, folder_name, flags, folder);
if (ex && ex->id)
printf(" failed: '%s'\n", ex->desc);
g_free(u);
Index: camel-stream-filter.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-filter.c,v
retrieving revision 1.33
diff -u -p -r1.33 camel-stream-filter.c
--- camel-stream-filter.c 6 Dec 2005 04:21:55 -0000 1.33
+++ camel-stream-filter.c 10 Apr 2006 12:28:41 -0000
@@ -51,8 +51,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-tcp-stream-ssl.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-tcp-stream-ssl.c,v
retrieving revision 1.70
diff -u -p -r1.70 camel-tcp-stream-ssl.c
--- camel-tcp-stream-ssl.c 13 Dec 2005 13:54:59 -0000 1.70
+++ camel-tcp-stream-ssl.c 10 Apr 2006 12:28:41 -0000
@@ -51,9 +51,7 @@
#include <glib/gstdio.h>
-/* this is commented because otherwise we get an error about the
- redefinition of MD5Context...yay */
-/*#include <libedataserver/md5-utils.h>*/
+#include <libedataserver/md5-utils.h>
#include "camel-certdb.h"
#include "camel-file-utils.h"
@@ -64,10 +62,6 @@
#include "camel-stream-fs.h"
#include "camel-tcp-stream-ssl.h"
-
-/* from md5-utils.h */
-void md5_get_digest (const char *buffer, int buffer_size, unsigned char digest[16]);
-
#define IO_TIMEOUT (PR_TicksPerSecond() * 4 * 60)
#define CONNECT_TIMEOUT (PR_TicksPerSecond () * 4 * 60)
@@ -733,7 +727,7 @@ camel_certdb_nss_cert_get(CamelCertDB *c
close (fd);
if (nread != st.st_size) {
- g_warning ("cert size read truncated %s: %d != %ld", path, nread, st.st_size);
+ g_warning ("cert size read truncated %s: %u != %ld", path, nread, st.st_size);
g_byte_array_free(ccert->rawcert, TRUE);
ccert->rawcert = NULL;
g_free(fingerprint);
Index: camel-text-index.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-text-index.c,v
retrieving revision 1.24
diff -u -p -r1.24 camel-text-index.c
--- camel-text-index.c 30 Nov 2005 09:54:54 -0000 1.24
+++ camel-text-index.c 10 Apr 2006 12:28:41 -0000
@@ -981,12 +981,12 @@ camel_text_index_info(CamelTextIndex *id
int frag;
printf("Path: '%s'\n", idx->parent.path);
- printf("Version: %d\n", idx->parent.version);
+ printf("Version: %u\n", idx->parent.version);
printf("Flags: %08x\n", idx->parent.flags);
- printf("Total words: %d\n", rb->words);
- printf("Total names: %d\n", rb->names);
- printf("Total deleted: %d\n", rb->deleted);
- printf("Total key blocks: %d\n", rb->keys);
+ printf("Total words: %u\n", rb->words);
+ printf("Total names: %u\n", rb->names);
+ printf("Total deleted: %u\n", rb->deleted);
+ printf("Total key blocks: %u\n", rb->keys);
if (rb->words > 0) {
frag = ((rb->keys - rb->words) * 100)/ rb->words;
@@ -1335,7 +1335,7 @@ camel_text_index_validate(CamelTextIndex
while (data) {
printf(" data %x ", data);
if (camel_key_file_read(p->links, &data, &count, &records) == -1) {
- printf("Warning, read failed for word '%s', at data '%d'\n", word, data);
+ printf("Warning, read failed for word '%s', at data '%u'\n", word, data);
data = 0;
} else {
printf("(%d)\n", (int)count);
Index: camel-url.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-url.c,v
retrieving revision 1.45
diff -u -p -r1.45 camel-url.c
--- camel-url.c 15 Sep 2005 17:35:45 -0000 1.45
+++ camel-url.c 10 Apr 2006 12:28:41 -0000
@@ -58,7 +58,7 @@ camel_url_new_with_base (CamelURL *base,
{
CamelURL *url;
const char *end, *hash, *colon, *semi, *at, *slash, *question;
- const char *p;
+ const char *proto;
url = g_new0 (CamelURL, 1);
@@ -77,15 +77,15 @@ camel_url_new_with_base (CamelURL *base,
end = url_string + strlen (url_string);
/* Find protocol: initial [a-z+.-]* substring until ":" */
- p = url_string;
- while (p < end && (isalnum ((unsigned char)*p) ||
- *p == '.' || *p == '+' || *p == '-'))
- p++;
+ proto = url_string;
+ while (proto < end && (isalnum ((unsigned char)*proto) ||
+ *proto == '.' || *proto == '+' || *proto == '-'))
+ proto++;
- if (p > url_string && *p == ':') {
- url->protocol = g_strndup (url_string, p - url_string);
+ if (proto > url_string && *proto == ':') {
+ url->protocol = g_strndup (url_string, proto - url_string);
camel_strdown (url->protocol);
- url_string = p + 1;
+ url_string = proto + 1;
}
if (!*url_string && !base)
Index: camel-vee-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-vee-folder.c,v
retrieving revision 1.78
diff -u -p -r1.78 camel-vee-folder.c
--- camel-vee-folder.c 8 Dec 2005 06:46:02 -0000 1.78
+++ camel-vee-folder.c 10 Apr 2006 12:28:42 -0000
@@ -1271,7 +1271,7 @@ folder_changed_change(CamelSession *sess
CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);
dd(printf("Vfolder '%s' subfolder changed '%s'\n", folder->full_name, sub->full_name));
- dd(printf(" changed %d added %d removed %d\n", changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
+ dd(printf(" changed %u added %u removed %u\n", changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
/* Always remove removed uid's, in any case */
for (i=0;i<changes->uid_removed->len;i++) {
Index: providers/groupwise/camel-groupwise-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v
retrieving revision 1.128
diff -u -p -r1.128 camel-groupwise-folder.c
--- providers/groupwise/camel-groupwise-folder.c 6 Apr 2006 09:43:14 -0000 1.128
+++ providers/groupwise/camel-groupwise-folder.c 10 Apr 2006 12:28:42 -0000
@@ -76,7 +76,7 @@ struct _CamelGroupwiseFolderPrivate {
/*prototypes*/
static void groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *destination, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex);
static int gw_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-void convert_to_calendar (EGwItem *item, char **str, int *len);
+static void convert_to_calendar (EGwItem *item, char **str, int *len);
static void convert_to_task (EGwItem *item, char **str, int *len);
static void gw_update_all_items ( CamelFolder *folder, GList *item_list, CamelException *ex);
static void groupwise_populate_details_from_item (CamelMimeMessage *msg, EGwItem *item);
@@ -551,6 +551,7 @@ move_to_junk (CamelFolder *folder, Camel
if (dest)
groupwise_transfer_messages_to (folder, uids, dest, NULL, TRUE, ex);
else {
+ /* Check the return? */
fi = create_junk_folder (folder->parent_store);
dest = camel_store_get_folder (folder->parent_store, JUNK_FOLDER, 0, ex);
if (!dest)
@@ -815,7 +816,7 @@ update_update (CamelSession *session, Ca
((char *)item_list->data)[i-1] = '\0';
}*/
- g_print ("\nNumber of items in the folder: %d \n", g_list_length(items_full_list));
+ g_print ("\nNumber of items in the folder: %u \n", g_list_length(items_full_list));
gw_update_all_items (m->folder, items_full_list, ex);
}
@@ -1175,30 +1176,30 @@ gw_update_cache (CamelFolder *folder, GL
org = e_gw_item_get_organizer (item);
if (org) {
- GString *str;
- str = g_string_new ("");
+ GString *string;
+ string = g_string_new ("");
if (org->display_name && org->display_name[0])
- str = g_string_append (str, org->display_name);
+ string = g_string_append (string, org->display_name);
if (org->email && org->email[0]) {
- g_string_append (str, "<");
- str = g_string_append (str, org->email);
- g_string_append (str, ">");
+ g_string_append (string, "<");
+ string = g_string_append (string, org->email);
+ g_string_append (string, ">");
}
- mi->info.from = camel_pstring_strdup (str->str);
- g_string_free (str, TRUE);
+ mi->info.from = camel_pstring_strdup (string->str);
+ g_string_free (string, TRUE);
}
g_string_truncate (str, 0);
recp_list = e_gw_item_get_recipient_list (item);
if (recp_list) {
GSList *rl;
- int i = 0;
+ int counter = 0;
for (rl = recp_list; rl != NULL; rl = rl->next) {
EGwItemRecipient *recp = (EGwItemRecipient *) rl->data;
if (recp->type == E_GW_ITEM_RECIPIENT_TO) {
- if (i)
+ if (counter)
str = g_string_append (str, ", ");
g_string_append_printf (str,"%s <%s>", recp->display_name, recp->email);
- i++;
+ counter++;
}
}
if (exists)
@@ -1378,17 +1379,17 @@ gw_update_summary ( CamelFolder *folder,
org = e_gw_item_get_organizer (item);
if (org) {
- GString *str;
- str = g_string_new ("");
+ GString *string;
+ string = g_string_new ("");
if (org->display_name && org->display_name[0])
- str = g_string_append (str, org->display_name);
+ string = g_string_append (string, org->display_name);
if (org->email && org->email[0]) {
- g_string_append (str, "<");
- str = g_string_append (str, org->email);
- g_string_append (str, ">");
+ g_string_append (string, "<");
+ str = g_string_append (string, org->email);
+ g_string_append (string, ">");
}
- mi->info.from = camel_pstring_strdup (str->str);
- g_string_free (str, TRUE);
+ mi->info.from = camel_pstring_strdup (string->str);
+ g_string_free (string, TRUE);
}
g_string_truncate (str, 0);
recp_list = e_gw_item_get_recipient_list (item);
@@ -1467,13 +1468,12 @@ groupwise_folder_item_to_msg( CamelFolde
const char *container_id = NULL;
GSList *attach_list = NULL;
EGwItemType type;
- EGwConnectionStatus status;
+ EGwConnectionStatus status = { 0, };
EGwConnection *cnc;
CamelMultipart *multipart;
int errno;
char *body = NULL;
const char *uid = NULL;
- gboolean is_text_html = FALSE;
gboolean is_text_html_embed = FALSE;
gboolean is_base64_encoded = FALSE;
@@ -1505,7 +1505,6 @@ groupwise_folder_item_to_msg( CamelFolde
if (!g_ascii_strcasecmp (attach->name, "TEXT.htm")) {
body = g_strdup (attachment);
g_free (attachment);
- is_text_html = TRUE;
}
}//if attachment and len
} // if Mime.822 or TEXT.htm
@@ -1754,7 +1753,7 @@ groupwise_append_message (CamelFolder *f
CamelGroupwiseStorePrivate *priv = gw_store->priv;
CamelOfflineStore *offline = (CamelOfflineStore *) folder->parent_store;
CamelAddress *recipients;
- EGwConnectionStatus status;
+ EGwConnectionStatus status = { 0, };
EGwConnection *cnc;
EGwItem *item;
char *id;
@@ -1912,9 +1911,6 @@ groupwise_transfer_messages_to (CamelFol
index = 0;
while (index < uids->len) {
- int count;
- count = camel_folder_summary_count (destination->summary);
-
if (delete_originals)
status = e_gw_connection_move_item (cnc, (const char *)uids->pdata[index],
dest_container_id, source_container_id);
@@ -2123,7 +2119,7 @@ gw_getv (CamelObject *object, CamelExcep
}
-void
+static void
convert_to_calendar (EGwItem *item, char **str, int *len)
{
EGwItemOrganizer *org = NULL;
Index: 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
--- providers/groupwise/camel-groupwise-provider.c 31 Aug 2005 04:26:07 -0000 1.33
+++ providers/groupwise/camel-groupwise-provider.c 10 Apr 2006 12:28:42 -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: providers/groupwise/camel-groupwise-store-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store-summary.c,v
retrieving revision 1.6
diff -u -p -r1.6 camel-groupwise-store-summary.c
--- providers/groupwise/camel-groupwise-store-summary.c 14 Dec 2005 15:28:37 -0000 1.6
+++ providers/groupwise/camel-groupwise-store-summary.c 10 Apr 2006 12:28:42 -0000
@@ -257,7 +257,7 @@ camel_groupwise_store_summary_path_to_fu
if (si && strlen(subpath) == strlen(path)) {
f = g_strdup(camel_groupwise_store_info_full_name(s, si));
camel_store_summary_info_free((CamelStoreSummary *)s, si);
- return f;
+ return (char *)f;
}
ns = camel_groupwise_store_summary_namespace_find_path(s, path);
@@ -306,7 +306,7 @@ camel_groupwise_store_summary_path_to_fu
g_free(f);
f = full;
}
- return f ;
+ return (char *)f;
}
CamelGroupwiseStoreNamespace *
Index: providers/groupwise/camel-groupwise-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.99
diff -u -p -r1.99 camel-groupwise-store.c
--- providers/groupwise/camel-groupwise-store.c 6 Apr 2006 05:57:40 -0000 1.99
+++ providers/groupwise/camel-groupwise-store.c 10 Apr 2006 12:28:42 -0000
@@ -332,6 +332,8 @@ groupwise_connect (CamelService *service
return FALSE;
}
+
+#if 0
static void
groupwise_disconnect_cleanup (CamelService *service, gboolean clean, CamelException *ex)
{
@@ -385,6 +387,7 @@ groupwise_disconnect_cleanup (CamelServi
groupwise_store->priv = NULL;
}
}
+#endif
static gboolean
groupwise_disconnect (CamelService *service, gboolean clean, CamelException *ex)
@@ -482,10 +485,6 @@ groupwise_forget_folder (CamelGroupwiseS
char *summary_file, *state_file;
char *folder_dir, *storage_path;
CamelFolderInfo *fi;
- const char *name;
-
-
- name = folder_name;
storage_path = g_strdup_printf ("%s/folders", priv->storage_path);
folder_dir = g_strdup(e_path_to_physical (storage_path,folder_name));
@@ -561,7 +560,7 @@ groupwise_get_folder (CamelStore *store,
const char *position = E_GW_CURSOR_POSITION_END;
int count = 0, cursor, summary_count = 0;
CamelStoreInfo *si = NULL;
- guint total;
+ guint total = 0;
folder = groupwise_get_folder_from_disk (store, folder_name, flags, ex);
if (folder) {
@@ -699,7 +698,7 @@ gw_store_reload_folder (CamelGroupwiseSt
const char *position = E_GW_CURSOR_POSITION_END;
int count = 0, cursor, summary_count = 0;
CamelStoreInfo *si = NULL;
- guint total;
+ guint total = 0;
camel_exception_clear (ex);
@@ -1073,6 +1072,7 @@ struct _store_refresh_msg {
CamelException ex;
};
+#if 0
static void
store_refresh_refresh (CamelSession *session, CamelSessionThreadMsg *msg)
{
@@ -1104,6 +1104,7 @@ static CamelSessionThreadOps store_refre
store_refresh_refresh,
store_refresh_free,
};
+#endif
/*** Thread stuff ends ***/
@@ -1113,19 +1114,20 @@ groupwise_get_folder_info (CamelStore *s
CamelGroupwiseStore *groupwise_store = CAMEL_GROUPWISE_STORE (store);
CamelGroupwiseStorePrivate *priv = groupwise_store->priv;
CamelFolderInfo *info = NULL;
+#if 0
char *top_folder = NULL;
if (top) {
top_folder = g_hash_table_lookup (priv->name_hash, top);
/* 'top' is a valid path, but doesnt have a container id
* return NULL */
-/* if (!top_folder) {
+ if (!top_folder) {
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
_("You must be working online to complete this operation"));
return NULL;
- }*/
+ }
}
-
+#endif
if (top && groupwise_is_system_folder (top))
return groupwise_build_folder_info (groupwise_store, NULL, top );
Index: providers/groupwise/camel-groupwise-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-utils.c,v
retrieving revision 1.31
diff -u -p -r1.31 camel-groupwise-utils.c
--- providers/groupwise/camel-groupwise-utils.c 21 Mar 2006 06:12:04 -0000 1.31
+++ providers/groupwise/camel-groupwise-utils.c 10 Apr 2006 12:28:42 -0000
@@ -360,17 +360,17 @@ send_as_attachment (EGwConnection *cnc,
if (!g_ascii_strncasecmp (attachment->contentType, RFC_822, strlen (RFC_822))) {
char *temp_id = NULL, *id = NULL;
temp_id = (char *)camel_medium_get_header (CAMEL_MEDIUM ((CamelMimeMessage *)dw), "Message-Id");
- int len = strlen (temp_id);
+ int length = strlen (temp_id);
- id = (char *)g_malloc0 (len-1);
- id = memcpy(id, temp_id+2, len-3);
+ id = (char *)g_malloc0 (length-1);
+ id = memcpy(id, temp_id+2, length-3);
status = e_gw_connection_forward_item (cnc, id, NULL, TRUE, &temp_item);
if (status != E_GW_CONNECTION_STATUS_OK)
g_warning ("Could not send a forwardRequest...continuing without!!\n");
else {
- GSList *attach_list = e_gw_item_get_attach_id_list (temp_item);
- EGwItemAttachment *temp_attach = (EGwItemAttachment *)attach_list->data;
+ GSList *attachment_list = e_gw_item_get_attach_id_list (temp_item);
+ EGwItemAttachment *temp_attach = (EGwItemAttachment *)attachment_list->data;
attachment->id = g_strdup (temp_attach->id);
attachment->item_reference = g_strdup (temp_attach->item_reference);
g_free (attachment->name);
@@ -588,12 +588,11 @@ do_multipart (EGwConnection *cnc, EGwIte
CamelMimePart *part;
CamelStreamMem *content = (CamelStreamMem *)camel_stream_mem_new ();
CamelDataWrapper *dw = NULL;
- const char *disposition, *filename;
+ const char *filename;
char *buffer = NULL;
char *mime_type = NULL;
const char *content_id = NULL;
char *encoding;
- gboolean is_alternative = FALSE;
/*
* XXX:
* Assuming the first part always is the actual message
@@ -601,8 +600,8 @@ do_multipart (EGwConnection *cnc, EGwIte
*/
part = camel_multipart_get_part (mp, i);
type = camel_mime_part_get_content_type(part);
- if (CAMEL_IS_MULTIPART ((CamelMultipart *)camel_medium_get_content_object (part))) {
- do_multipart (cnc, item, (CamelMultipart *)camel_medium_get_content_object (part), attach_list);
+ if (CAMEL_IS_MULTIPART ((CamelMultipart *)camel_medium_get_content_object ((CamelMedium *)part))) {
+ do_multipart (cnc, item, (CamelMultipart *)camel_medium_get_content_object ((CamelMedium *)part), attach_list);
continue;
} else
dw = camel_medium_get_content_object (CAMEL_MEDIUM (part));
@@ -613,13 +612,11 @@ do_multipart (EGwConnection *cnc, EGwIte
temp_part = camel_multipart_get_part ((CamelMultipart *)dw, 1);
CamelDataWrapper *temp_dw = NULL;
if (temp_part) {
- is_alternative = TRUE;
temp_dw = camel_medium_get_content_object (CAMEL_MEDIUM (temp_part));
camel_data_wrapper_write_to_stream(temp_dw, (CamelStream *)temp_content);
buffer = g_malloc0 (temp_content->buffer->len+1);
buffer = memcpy (buffer, temp_content->buffer->data, temp_content->buffer->len);
filename = camel_mime_part_get_filename (temp_part);
- disposition = camel_mime_part_get_disposition (temp_part);
mime_type = camel_data_wrapper_get_mime_type (temp_dw);
cid = camel_mime_part_get_content_id (temp_part);
g_print ("%s:%s\n",filename,camel_transfer_encoding_to_string(temp_part->encoding));
@@ -637,7 +634,6 @@ do_multipart (EGwConnection *cnc, EGwIte
encoding = camel_transfer_encoding_to_string (part->encoding);
filename = camel_mime_part_get_filename (part);
buffer = memcpy (buffer, content->buffer->data, content->buffer->len);
- disposition = camel_mime_part_get_disposition (part);
mime_type = camel_data_wrapper_get_mime_type (dw);
content_id = camel_mime_part_get_content_id (part);
Index: providers/hula/camel-hula-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/hula/camel-hula-provider.c,v
retrieving revision 1.1
diff -u -p -r1.1 camel-hula-provider.c
--- providers/hula/camel-hula-provider.c 14 Nov 2005 17:39:32 -0000 1.1
+++ providers/hula/camel-hula-provider.c 10 Apr 2006 12:28:42 -0000
@@ -40,7 +40,7 @@ static gint check_equal (char *s1, char
static gint hula_url_equal (gconstpointer a, gconstpointer b);
-CamelProviderConfEntry hula_conf_entries[] = {
+static CamelProviderConfEntry hula_conf_entries[] = {
/* override the labels/defaults of the standard settings */
{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
N_("Checking for New Mail") },
@@ -88,7 +88,7 @@ static CamelProvider hula_provider = {
/* ... */
};
-CamelServiceAuthType camel_hula_password_authtype = {
+static CamelServiceAuthType camel_hula_password_authtype = {
N_("Password"),
N_("This option will connect to the Hula server using a "
Index: providers/imap/camel-imap-command.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-command.c,v
retrieving revision 1.76
diff -u -p -r1.76 camel-imap-command.c
--- providers/imap/camel-imap-command.c 16 Jan 2006 20:25:58 -0000 1.76
+++ providers/imap/camel-imap-command.c 10 Apr 2006 12:28:42 -0000
@@ -50,7 +50,7 @@ extern int camel_verbose_debug;
static gboolean imap_command_start (CamelImapStore *store, CamelFolder *folder,
const char *cmd, CamelException *ex);
-CamelImapResponse *imap_read_response (CamelImapStore *store,
+static CamelImapResponse *imap_read_response (CamelImapStore *store,
CamelException *ex);
static char *imap_read_untagged (CamelImapStore *store, char *line,
CamelException *ex);
@@ -211,10 +211,10 @@ imap_command_start (CamelImapStore *stor
else
mask = cmd;
- fprintf (stderr, "sending : %c%.5d %s\r\n", store->tag_prefix, store->command, mask);
+ fprintf (stderr, "sending : %c%.5u %s\r\n", store->tag_prefix, store->command, mask);
}
- nwritten = camel_stream_printf (store->ostream, "%c%.5d %s\r\n",
+ nwritten = camel_stream_printf (store->ostream, "%c%.5u %s\r\n",
store->tag_prefix, store->command++, cmd);
if (nwritten == -1) {
@@ -530,7 +530,7 @@ imap_read_untagged (CamelImapStore *stor
* don't want it to be shorter either, because then the
* GString's length would be off...
*/
- sprintf (p, "{%0*d}", ldigits, length);
+ sprintf (p, "{%0*u}", ldigits, length);
fulllen += str->len;
g_ptr_array_add (data, str);
Index: providers/imap/camel-imap-store-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-store-summary.c,v
retrieving revision 1.17
diff -u -p -r1.17 camel-imap-store-summary.c
--- providers/imap/camel-imap-store-summary.c 14 Dec 2005 21:31:52 -0000 1.17
+++ providers/imap/camel-imap-store-summary.c 10 Apr 2006 12:28:42 -0000
@@ -235,7 +235,7 @@ camel_imap_store_summary_path_to_full(Ca
if (si && strlen(subpath) == strlen(path)) {
f = g_strdup(camel_imap_store_info_full_name(s, si));
camel_store_summary_info_free((CamelStoreSummary *)s, si);
- return f;
+ return (char *)f;
}
ns = camel_imap_store_summary_namespace_find_path(s, path);
Index: providers/imap/camel-imap-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-store.c,v
retrieving revision 1.340
diff -u -p -r1.340 camel-imap-store.c
--- providers/imap/camel-imap-store.c 16 Jan 2006 20:25:58 -0000 1.340
+++ providers/imap/camel-imap-store.c 10 Apr 2006 12:28:43 -0000
@@ -564,7 +564,7 @@ connect_to_server (CamelService *service
CamelStream *tcp_stream;
CamelSockOptData sockopt;
gboolean force_imap4 = FALSE;
- int clean_quit = TRUE, ret;
+ gboolean clean_quit = TRUE;
char *buf;
if (ssl_mode != MODE_CLEAR) {
@@ -585,7 +585,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"));
@@ -1180,54 +1180,6 @@ imap_check_folder_still_extant (CamelIma
assume it worked so we dont blow away the folder unecessarily */
return TRUE;
}
-
-/* This is a little 'hack' to avoid the deadlock conditions that would otherwise
- ensue when calling camel_folder_refresh_info from inside a lock */
-/* NB: on second thougts this is probably not entirely safe, but it'll do for now */
-/* No, its definetly not safe. So its been changed to copy the folders first */
-/* the alternative is to:
- make the camel folder->lock recursive (which should probably be done)
- or remove it from camel_folder_refresh_info, and use another locking mechanism */
-/* also see get_folder_info_online() for the same hack repeated */
-static void
-imap_store_refresh_folders (CamelImapStore *store, CamelException *ex)
-{
- GPtrArray *folders;
- int i;
-
- folders = camel_object_bag_list(CAMEL_STORE (store)->folders);
-
- for (i = 0; i <folders->len; i++) {
- CamelFolder *folder = folders->pdata[i];
-
- /* NB: we can have vtrash folders also in our store ... bit hacky */
- if (!CAMEL_IS_IMAP_FOLDER(folder)) {
- camel_object_unref(folder);
- continue;
- }
-
- CAMEL_IMAP_FOLDER (folder)->need_rescan = TRUE;
- if (!camel_exception_is_set(ex))
- CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(folder))->refresh_info(folder, ex);
-
- if (camel_exception_is_set (ex) &&
- imap_check_folder_still_extant (store, folder->full_name, ex) == FALSE) {
- gchar *namedup;
-
- /* the folder was deleted (may happen when we come back online
- * after being offline */
-
- namedup = g_strdup (folder->full_name);
- camel_object_unref(folder);
- imap_folder_effectively_unsubscribed (store, namedup, ex);
- imap_forget_folder (store, namedup, ex);
- g_free (namedup);
- } else
- camel_object_unref(folder);
- }
-
- g_ptr_array_free (folders, TRUE);
-}
static gboolean
try_auth (CamelImapStore *store, const char *mech, CamelException *ex)
Index: 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
--- providers/imap4/camel-imap4-command.c 31 Aug 2005 04:26:05 -0000 1.9
+++ providers/imap4/camel-imap4-command.c 10 Apr 2006 12:28:43 -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: providers/imap4/camel-imap4-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-folder.c,v
retrieving revision 1.47
diff -u -p -r1.47 camel-imap4-folder.c
--- providers/imap4/camel-imap4-folder.c 10 Jan 2006 07:56:47 -0000 1.47
+++ providers/imap4/camel-imap4-folder.c 10 Apr 2006 12:28:43 -0000
@@ -1010,13 +1010,11 @@ 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, '/')))
+ if (!(strrchr (parent_name, '/')))
*parent_name = '\0';
- else
- *p = '\0';
if (!(fi = camel_store_create_folder (folder->parent_store, parent_name, folder->name, &lex))) {
camel_exception_clear (&lex);
Index: 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
--- providers/imap4/camel-imap4-provider.c 31 Aug 2005 04:26:05 -0000 1.11
+++ providers/imap4/camel-imap4-provider.c 10 Apr 2006 12:28:43 -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: providers/imap4/camel-imap4-store-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-store-summary.c,v
retrieving revision 1.7
diff -u -p -r1.7 camel-imap4-store-summary.c
--- providers/imap4/camel-imap4-store-summary.c 31 Aug 2005 04:26:05 -0000 1.7
+++ providers/imap4/camel-imap4-store-summary.c 10 Apr 2006 12:28:43 -0000
@@ -113,7 +113,7 @@ camel_imap4_store_summary_finalize (Came
static CamelIMAP4NamespaceList *
load_namespaces (FILE *in)
{
- CamelIMAP4Namespace *ns, *tail;
+ CamelIMAP4Namespace *ns = NULL, *tail = NULL;
CamelIMAP4NamespaceList *nsl;
guint32 i, j, n;
@@ -171,7 +171,8 @@ static int
summary_header_load (CamelStoreSummary *s, FILE *in)
{
CamelIMAP4StoreSummary *is = (CamelIMAP4StoreSummary *) s;
- guint32 version, capa;
+ guint32 capa;
+ int version;
if (parent_class->summary_header_load (s, in) == -1)
return -1;
@@ -200,7 +201,7 @@ summary_header_load (CamelStoreSummary *
static int
save_namespaces (FILE *out, CamelIMAP4NamespaceList *nsl)
{
- CamelIMAP4Namespace *cur, *ns;
+ CamelIMAP4Namespace *cur = NULL, *ns;
guint32 i, n;
for (i = 0; i < 3; i++) {
Index: providers/imap4/camel-imap4-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-store.c,v
retrieving revision 1.57
diff -u -p -r1.57 camel-imap4-store.c
--- providers/imap4/camel-imap4-store.c 28 Mar 2006 17:22:42 -0000 1.57
+++ providers/imap4/camel-imap4-store.c 10 Apr 2006 12:28:43 -0000
@@ -315,7 +315,6 @@ connect_to_server (CamelIMAP4Engine *eng
CamelIMAP4Command *ic;
int id;
#endif
- int ret;
if (ssl_mode != MODE_CLEAR) {
#ifdef HAVE_SSL
@@ -335,7 +334,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"));
@@ -587,7 +586,6 @@ static gboolean
imap4_reconnect (CamelIMAP4Engine *engine, CamelException *ex)
{
CamelService *service = engine->service;
- CamelServiceAuthType *mech;
gboolean reprompt = FALSE;
char *errmsg = NULL;
CamelException lex;
@@ -596,7 +594,7 @@ imap4_reconnect (CamelIMAP4Engine *engin
return FALSE;
if (engine->state != CAMEL_IMAP4_ENGINE_AUTHENTICATED) {
-#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,
@@ -1476,9 +1474,10 @@ 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: providers/imap4/camel-imap4-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-summary.c,v
retrieving revision 1.44
diff -u -p -r1.44 camel-imap4-summary.c
--- providers/imap4/camel-imap4-summary.c 4 Apr 2006 16:50:39 -0000 1.44
+++ providers/imap4/camel-imap4-summary.c 10 Apr 2006 12:28:43 -0000
@@ -755,7 +755,6 @@ imap4_fetch_all_add (struct imap4_fetch_
{
CamelFolderChangeInfo *changes = NULL;
struct imap4_envelope_t *envelope;
- CamelMessageInfo *info;
int i;
changes = fetch->changes;
@@ -773,7 +772,7 @@ imap4_fetch_all_add (struct imap4_fetch_
continue;
}
- if ((info = camel_folder_summary_uid (fetch->summary, camel_message_info_uid (envelope->info)))) {
+ if ((camel_folder_summary_uid (fetch->summary, camel_message_info_uid (envelope->info)))) {
camel_message_info_free (envelope->info);
g_free (envelope);
continue;
Index: 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
--- providers/imap4/camel-imap4-utils.c 31 Aug 2005 04:26:05 -0000 1.16
+++ providers/imap4/camel-imap4-utils.c 10 Apr 2006 12:28:43 -0000
@@ -485,7 +485,7 @@ camel_imap4_parse_flags_list (CamelIMAP4
}
-struct {
+static struct {
const char *name;
guint32 flag;
} list_flags[] = {
Index: providers/local/camel-mbox-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-mbox-summary.c,v
retrieving revision 1.57
diff -u -p -r1.57 camel-mbox-summary.c
--- providers/local/camel-mbox-summary.c 28 Mar 2006 19:06:19 -0000 1.57
+++ providers/local/camel-mbox-summary.c 10 Apr 2006 12:28:44 -0000
@@ -1118,12 +1118,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++)) {
for (i=0;i<sizeof(status_flags)/sizeof(status_flags[0]);i++)
if (status_flags[i].tag == *p)
flags |= status_flags[i].flag;
Index: 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
--- providers/nntp/camel-nntp-provider.c 31 Aug 2005 04:26:02 -0000 1.27
+++ providers/nntp/camel-nntp-provider.c 10 Apr 2006 12:28:44 -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: providers/nntp/camel-nntp-store-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/camel-nntp-store-summary.c,v
retrieving revision 1.4
diff -u -p -r1.4 camel-nntp-store-summary.c
--- providers/nntp/camel-nntp-store-summary.c 31 Aug 2005 04:26:03 -0000 1.4
+++ providers/nntp/camel-nntp-store-summary.c 10 Apr 2006 12:28:44 -0000
@@ -274,7 +274,7 @@ camel_nntp_store_summary_path_to_full (C
f = full;
}
- return f;
+ return (char *)f;
}
CamelNNTPStoreInfo *
Index: providers/nntp/camel-nntp-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/camel-nntp-store.c,v
retrieving revision 1.83
diff -u -p -r1.83 camel-nntp-store.c
--- providers/nntp/camel-nntp-store.c 30 Nov 2005 16:04:02 -0000 1.83
+++ providers/nntp/camel-nntp-store.c 10 Apr 2006 12:28:44 -0000
@@ -168,7 +168,6 @@ connect_to_server (CamelService *service
gboolean retval = FALSE;
unsigned char *buf;
unsigned int len;
- int ret;
char *path;
CAMEL_SERVICE_LOCK(store, connect_lock);
@@ -191,7 +190,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"));
@@ -561,7 +560,7 @@ nntp_store_info_update(CamelNNTPStore *s
}
}
- printf("store info update '%s' first '%d' last '%d'\n", line, first, last);
+ printf("store info update '%s' first '%u' last '%u'\n", line, first, last);
if (si->last) {
if (last > si->last)
Index: providers/nntp/camel-nntp-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/camel-nntp-stream.c,v
retrieving revision 1.7
diff -u -p -r1.7 camel-nntp-stream.c
--- providers/nntp/camel-nntp-stream.c 15 Sep 2005 22:24:27 -0000 1.7
+++ providers/nntp/camel-nntp-stream.c 10 Apr 2006 12:28:44 -0000
@@ -343,8 +343,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: providers/nntp/camel-nntp-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/camel-nntp-summary.c,v
retrieving revision 1.21
diff -u -p -r1.21 camel-nntp-summary.c
--- providers/nntp/camel-nntp-summary.c 31 Aug 2005 04:26:03 -0000 1.21
+++ providers/nntp/camel-nntp-summary.c 10 Apr 2006 12:28:44 -0000
@@ -333,7 +333,7 @@ add_range_head(CamelNNTPSummary *cns, Ca
line += 3;
n = strtoul(line, &line, 10);
if (n != i)
- g_warning("retrieved message '%d' when i expected '%d'?\n", n, i);
+ g_warning("retrieved message '%u' when i expected '%d'?\n", n, i);
/* FIXME: use camel-mime-utils.c function for parsing msgid? */
if ((msgid = strchr(line, '<')) && (line = strchr(msgid+1, '>'))){
Index: providers/pop3/camel-pop3-engine.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/camel-pop3-engine.c,v
retrieving revision 1.11
diff -u -p -r1.11 camel-pop3-engine.c
--- providers/pop3/camel-pop3-engine.c 31 Aug 2005 04:26:04 -0000 1.11
+++ providers/pop3/camel-pop3-engine.c 10 Apr 2006 12:28:44 -0000
@@ -170,7 +170,7 @@ camel_pop3_engine_reget_capabilities (Ca
/* TODO: read implementation too?
etc? */
-struct {
+static struct {
char *cap;
guint32 flag;
} capa[] = {
Index: providers/pop3/camel-pop3-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/camel-pop3-folder.c,v
retrieving revision 1.71
diff -u -p -r1.71 camel-pop3-folder.c
--- providers/pop3/camel-pop3-folder.c 15 Sep 2005 22:28:37 -0000 1.71
+++ providers/pop3/camel-pop3-folder.c 10 Apr 2006 12:28:44 -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: 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
--- providers/pop3/camel-pop3-provider.c 31 Aug 2005 04:26:04 -0000 1.34
+++ providers/pop3/camel-pop3-provider.c 10 Apr 2006 12:28:44 -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 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 CamelServiceAuthType camel_pop3_apop_authtype = {
"APOP",
N_("This option will connect to the POP server using an encrypted "
Index: 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
--- providers/pop3/camel-pop3-stream.c 31 Aug 2005 04:26:04 -0000 1.5
+++ providers/pop3/camel-pop3-stream.c 10 Apr 2006 12:28:44 -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 */