From 777f8cf10f5c50235cb0c1c7f842fd2e22cfeb4d Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 28 Mar 2003 00:13:46 +0000 Subject: remove unused var. 2003-03-28 Not Zed * providers/local/camel-spool-store.c (get_folder): remove unused var. * providers/imap/camel-imap-utils.c (imap_parse_list_response): moved an unused var to the #if 0'd out block. * providers/imap/camel-imap-store.c (parse_list_response_as_folder_info): remove unused vars. * camel-index-control.c (main): deifne camel_init() before using it. * camel-vee-store.c (vee_get_folder): removed unused var. * camel-stream-mem.c (stream_write): warning -> fixme. * camel-stream-filter.c (_CamelStreamFilterPrivate): Add a ; to the end of the struct definition. * camel-store.c (camel_store_delete_folder): remove unused var. (camel_store_rename_folder): " (camel_store_unsubscribe_folder): " * camel-mime-part.c (write_to_stream): Changed warning into a TODO. (construct_from_parser): removed warning, the code was fixed. * camel-mime-message.c (construct_from_parser): Remove the warning, the code was fixed. * camel-mime-filter-enriched.c (camel_mime_filter_enriched_new): Remove unused var. * camel-medium.c (camel_medium_get_header): Removed warning, and changed docs to reflect it. * camel-gpg-context.c (gpg_ctx_parse_status): handle MODE_EXPORT as a noop (warning). * camel-folder.c (get_message_user_tag): changed a warning into a fixme (its not that important). (camel_folder_get_message_user_tag): " * camel-data-cache.c (data_cache_finalise): removed unused vars. (data_cache_expire): " svn path=/trunk/; revision=20556 --- camel/ChangeLog | 48 +++++++++++++++++++++++++++++++ camel/camel-data-cache.c | 5 ---- camel/camel-folder.c | 4 +-- camel/camel-gpg-context.c | 3 ++ camel/camel-index-control.c | 2 ++ camel/camel-medium.c | 8 ++---- camel/camel-mime-filter-enriched.c | 1 - camel/camel-mime-message.c | 3 -- camel/camel-mime-part.c | 11 ++----- camel/camel-store.c | 3 -- camel/camel-stream-filter.c | 2 +- camel/camel-stream-mem.c | 4 +-- camel/camel-vee-store.c | 1 - camel/providers/imap/camel-imap-store.c | 4 +-- camel/providers/imap/camel-imap-utils.c | 4 ++- camel/providers/local/camel-spool-store.c | 1 - 16 files changed, 67 insertions(+), 37 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index edb63918f7..518237af2e 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,51 @@ +2003-03-28 Not Zed + + * providers/local/camel-spool-store.c (get_folder): remove unused + var. + + * providers/imap/camel-imap-utils.c (imap_parse_list_response): + moved an unused var to the #if 0'd out block. + + * providers/imap/camel-imap-store.c + (parse_list_response_as_folder_info): remove unused vars. + + * camel-index-control.c (main): deifne camel_init() before using + it. + + * camel-vee-store.c (vee_get_folder): removed unused var. + + * camel-stream-mem.c (stream_write): warning -> fixme. + + * camel-stream-filter.c (_CamelStreamFilterPrivate): Add a ; to + the end of the struct definition. + + * camel-store.c (camel_store_delete_folder): remove unused var. + (camel_store_rename_folder): " + (camel_store_unsubscribe_folder): " + + * camel-mime-part.c (write_to_stream): Changed warning into a + TODO. + (construct_from_parser): removed warning, the code was fixed. + + * camel-mime-message.c (construct_from_parser): Remove the + warning, the code was fixed. + + * camel-mime-filter-enriched.c (camel_mime_filter_enriched_new): + Remove unused var. + + * camel-medium.c (camel_medium_get_header): Removed warning, and + changed docs to reflect it. + + * camel-gpg-context.c (gpg_ctx_parse_status): handle MODE_EXPORT + as a noop (warning). + + * camel-folder.c (get_message_user_tag): changed a warning into a + fixme (its not that important). + (camel_folder_get_message_user_tag): " + + * camel-data-cache.c (data_cache_finalise): removed unused vars. + (data_cache_expire): " + 2003-03-27 Jeffrey Stedfast * camel-sasl-gssapi.c (gssapi_challenge): Get rid of debug diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c index 7d5d225f1e..5d42b97653 100644 --- a/camel/camel-data-cache.c +++ b/camel/camel-data-cache.c @@ -44,8 +44,6 @@ extern int camel_verbose_debug; #define dd(x) (camel_verbose_debug?(x):0) #define d(x) -static void stream_finalised(CamelObject *o, void *event_data, void *data); - /* how many 'bits' of hash are used to key the toplevel directory */ #define CAMEL_DATA_CACHE_BITS (6) #define CAMEL_DATA_CACHE_MASK ((1<priv; camel_object_bag_destroy(p->busy_bag); @@ -197,7 +193,6 @@ data_cache_expire(CamelDataCache *cdc, const char *path, const char *keep, time_ struct dirent *d; GString *s; struct stat st; - char *oldpath; CamelStream *stream; dir = opendir(path); diff --git a/camel/camel-folder.c b/camel/camel-folder.c index ac48ba3a25..bca5f25e9f 100644 --- a/camel/camel-folder.c +++ b/camel/camel-folder.c @@ -814,7 +814,7 @@ get_message_user_tag(CamelFolder *folder, const char *uid, const char *name) if (info == NULL) return NULL; -#warning "Need to duplicate tag string" + /* FIXME: Need to duplicate tag string */ ret = camel_tag_get(&info->user_tags, name); camel_folder_summary_info_free(folder->summary, info); @@ -837,7 +837,7 @@ camel_folder_get_message_user_tag (CamelFolder *folder, const char *uid, const g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0); -#warning "get_message_user_tag() needs to copy the tag contents" + /* FIXME: should duplicate string */ ret = CF_CLASS (folder)->get_message_user_tag (folder, uid, name); return ret; diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index ce16e9b574..af6f7d2d4f 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -872,6 +872,9 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex) if (!strncmp (status, "IMPORT_RES", 10)) gpg->seen_eof1 = TRUE; break; + case GPG_CTX_MODE_EXPORT: + /* noop */ + break; } } diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c index e5dfe1dbdf..f42819f5a5 100644 --- a/camel/camel-index-control.c +++ b/camel/camel-index-control.c @@ -125,6 +125,8 @@ static int do_perf(int argc, char **argv); int main(int argc, char **argv) { + extern int camel_init(const char *certdb_dir, gboolean nss_init); + if (argc<2) do_usage(argv[0]); diff --git a/camel/camel-medium.c b/camel/camel-medium.c index afa685326d..64814eda5e 100644 --- a/camel/camel-medium.c +++ b/camel/camel-medium.c @@ -217,7 +217,9 @@ get_header(CamelMedium *medium, const char *header_name) * Returns the value of the named header in the medium, or %NULL if * it is unset. The caller should not modify or free the data. * - * FIXME: What if the header occurs more than once? + * If the header occurs more than once, only retrieve the first + * instance of the header. For multi-occuring headers, use + * :get_headers(). * * Return value: the value of the named header, or %NULL **/ @@ -227,10 +229,6 @@ camel_medium_get_header(CamelMedium *medium, const char *header_name) g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL); g_return_val_if_fail (header_name != NULL, NULL); -#ifndef NO_WARNINGS -#warning No way to get multi-valued headers? -#endif - return CM_CLASS (medium)->get_header (medium, header_name); } diff --git a/camel/camel-mime-filter-enriched.c b/camel/camel-mime-filter-enriched.c index 8cf8879162..349a56d07b 100644 --- a/camel/camel-mime-filter-enriched.c +++ b/camel/camel-mime-filter-enriched.c @@ -368,7 +368,6 @@ CamelMimeFilter * camel_mime_filter_enriched_new (guint32 flags) { CamelMimeFilterEnriched *new; - int i; new = (CamelMimeFilterEnriched *) camel_object_new (CAMEL_TYPE_MIME_FILTER_ENRICHED); new->flags = flags; diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index 5108670104..f3b79b4035 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -478,9 +478,6 @@ construct_from_parser (CamelMimePart *dw, CamelMimeParser *mp) } d(printf("mime_message::construct_from_parser() leaving\n")); -#ifndef NO_WARNINGS -#warning "return a real error code" -#endif err = camel_mime_parser_errno(mp); if (err != 0) { errno = err; diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c index 0a696ed1e9..78cdb9c6b7 100644 --- a/camel/camel-mime-part.c +++ b/camel/camel-mime-part.c @@ -632,11 +632,8 @@ write_to_stream(CamelDataWrapper *data_wrapper, CamelStream *stream) d(printf("mime_part::write_to_stream\n")); /* FIXME: something needs to be done about this ... */ - /* FIXME: need to count these bytes too */ -#ifndef NO_WARNINGS -#warning content-languages should be stored as a header -#endif - + /* TODO: content-languages header? */ + if (mp->headers) { struct _header_raw *h = mp->headers; char *val; @@ -800,10 +797,6 @@ construct_from_parser(CamelMimePart *dw, CamelMimeParser *mp) } d(printf("mime_part::construct_from_parser() leaving\n")); -#ifndef NO_WARNINGS -#warning "Need to work out how to detect a (fatally) bad parse in the parser" -#endif - err = camel_mime_parser_errno(mp); if (err != 0) { errno = err; diff --git a/camel/camel-store.c b/camel/camel-store.c index 852851f51b..2524560806 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -316,7 +316,6 @@ void camel_store_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex) { CamelFolder *folder = NULL; - char *key; CAMEL_STORE_LOCK(store, folder_lock); @@ -363,7 +362,6 @@ rename_folder (CamelStore *store, const char *old_name, const char *new_name, Ca void camel_store_rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex) { - char *key; CamelFolder *folder; int i, oldlen, namelen; GPtrArray *folders; @@ -1000,7 +998,6 @@ camel_store_unsubscribe_folder (CamelStore *store, CamelException *ex) { CamelFolder *folder = NULL; - char *key; g_return_if_fail (CAMEL_IS_STORE (store)); g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS); diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c index 0e529c0071..e17fcb8377 100644 --- a/camel/camel-stream-filter.c +++ b/camel/camel-stream-filter.c @@ -51,7 +51,7 @@ struct _CamelStreamFilterPrivate { size_t filteredlen; int last_was_read:1; /* was the last op read or write? */ - int flushed:1 /* were the filters flushed? */ + int flushed:1; /* were the filters flushed? */ }; #define READ_PAD (128) /* bytes padded before buffer */ diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c index d81b304231..7b93b7864b 100644 --- a/camel/camel-stream-mem.c +++ b/camel/camel-stream-mem.c @@ -185,9 +185,7 @@ stream_write (CamelStream *stream, const char *buffer, size_t n) if (seekable->bound_end != CAMEL_STREAM_UNBOUND) nwrite = MIN(seekable->bound_end - seekable->position, n); -#ifndef NO_WARNINGS -#warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object" -#endif + /* FIXME: we shouldn't use g_byte_arrays or g_malloc perhaps? */ if (seekable->position == stream_mem->buffer->len) { g_byte_array_append(stream_mem->buffer, (const guint8 *)buffer, nwrite); } else { diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c index 46cbd45415..3ad39237e0 100644 --- a/camel/camel-vee-store.c +++ b/camel/camel-vee-store.c @@ -146,7 +146,6 @@ vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, Camel CamelVeeFolder *vf; CamelFolder *folder; char *name, *p; - int add; vf = (CamelVeeFolder *)camel_vee_folder_new(store, folder_name, flags); if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0) { diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 9b7ddaf180..7004b7d6a7 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -1951,8 +1951,8 @@ parse_list_response_as_folder_info (CamelImapStore *imap_store, const char *response) { CamelFolderInfo *fi; - int flags, i; - char sep, *dir, *name = NULL, *path; + int flags; + char sep, *dir; CamelURL *url; CamelImapStoreInfo *si; guint32 newflags; diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c index 7ec152afa7..8a089da7bf 100644 --- a/camel/providers/imap/camel-imap-utils.c +++ b/camel/providers/imap/camel-imap-utils.c @@ -362,7 +362,7 @@ imap_parse_list_response (CamelImapStore *store, const char *buf, int *flags, ch return FALSE; if (folder) { - char *astring, *mailbox; + char *astring; /* get the folder name */ word = imap_next_word (word); @@ -372,6 +372,8 @@ imap_parse_list_response (CamelImapStore *store, const char *buf, int *flags, ch *folder = astring; #if 0 + char *mailbox; + mailbox = imap_mailbox_decode (astring, strlen (astring)); g_free (astring); if (!mailbox) diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c index f1f264f94a..09720e4a01 100644 --- a/camel/providers/local/camel-spool-store.c +++ b/camel/providers/local/camel-spool-store.c @@ -141,7 +141,6 @@ static CamelFolder * get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex) { CamelFolder *folder = NULL; - int fd; struct stat st; char *name; -- cgit v1.2.3