+2002-09-29 [christoph] 0.8.3claws34
+
+ * major code cleanup (part 2)
+
+ - unused variables removed
+ - unused functions removed
+ - uninitialized variables checked
+ - missing return statements added
+ - missing function return types added
+ - added parentheses around assignment
+ when suggested by gcc
+
2002-09-29 [alfons] 0.8.3claws33
* src/logwindow.c
2002-09-27 [christoph] 0.8.3claws31
* doc-src/readme.txt
- * doc-src/rfc1806.txt
- * doc-src/rfc2183.txt
- * doc-src/rfc2980.txt
+ * doc-src/rfc1806.txt ** REMOVED **
+ * doc-src/rfc2183.txt ** NEW FILE **
+ * doc-src/rfc2980.txt ** NEW FILE **
update rfcs
2002-09-27 [melvin] 0.8.3claws30
MICRO_VERSION=3
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws33
+EXTRA_VERSION=claws34
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
item->prefs->enable_default_account = FALSE;
item->prefs->default_account = 0;
prefs_folder_item_save_config(item);
+
+ return FALSE;
}
static void account_delete(void)
return person;
}
-/*
-* Load hash table visitor function.
-*/
-static void addrbook_load_hash_table_email_vis( gpointer key, gpointer value, gpointer data ) {
- AddrItemObject *obj = ( AddrItemObject * ) value;
-
- if( ADDRITEM_TYPE(obj) == ITEMTYPE_EMAIL ) {
- GHashTable *table = ( GHashTable * ) data;
- gchar *newKey = g_strdup( key );
- ItemEMail *email = ( ItemEMail * ) obj;
- if( ! g_hash_table_lookup( table, newKey ) ) {
- g_hash_table_insert( table, newKey, email );
- }
- }
-}
-
/*
* Build available email list visitor function.
*/
}
}
-static void addrclip_print( AddrSelectItem *item, FILE *stream ) {
- fprintf( stream, "Select Record\n" );
- fprintf( stream, "obj type: %d\n", item->objectType );
- fprintf( stream, " uid: %s\n", item->uid );
- fprintf( stream, "---\n" );
-}
-
/*
* Show clipboard contents.
* Enter: clipBoard Clipboard.
return copyList;
}
-/*
- * Paste unattached email into cache.
- * Enter: cache Address cache to paste into.
- * folder Folder to store
- * email EMail to add.
- * copyList List of email addresses pasted.
- * Return: Update list of email addresses pasted.
- */
-static GList *addrclip_cache_add_email(
- AddressCache *cache, ItemFolder *folder, ItemEMail *email,
- GList *copyList )
-{
- ItemPerson *newPerson;
- ItemEMail *newEMail;
- AddrClip_EMail *em;
-
- /* Create a person */
- newPerson = addritem_create_item_person();
- addritem_person_set_common_name( newPerson, "" );
- addrcache_id_person( cache, newPerson );
- addrcache_folder_add_person( cache, folder, newPerson );
-
- /* Copy email addresses */
- newEMail = addritem_copy_item_email( email );
- addrcache_id_email( cache, newEMail );
- addrcache_person_add_email( cache, newPerson, newEMail );
-
- /* Take a copy of the original */
- em = g_new0( AddrClip_EMail, 1 );
- em->original = email;
- em->copy = newEMail;
- copyList = g_list_append( copyList, em );
-
- return copyList;
-}
-
-/*
- * Test whether specified E-Mail address object is already in clipboard and
- * owned by an ItemPerson objects.
- * Enter: email E-Mail to test.
- * Return: TRUE if duplicate found.
- */
-static gboolean addrclip_test_email(
- AddressClipboard *clipBoard, ItemEMail *testEMail )
-{
- ItemPerson *person;
- ItemEMail *email;
- GList *node, *nodeMail;
- AddrSelectItem *item;
- AddrItemObject *aio;
- AddressCache *cache;
-
- node = clipBoard->objectList;
- while( node ) {
- item = node->data;
- cache = addrindex_get_cache( clipBoard->addressIndex, item->cacheID );
- aio = addrcache_get_object( cache, item->uid );
- if( aio ) {
- if( ADDRITEM_TYPE(aio) == ITEMTYPE_PERSON ) {
- person = ( ItemPerson * ) aio;
- nodeMail = person->listEMail;
- while( nodeMail ) {
- email = nodeMail->data;
- if( email == testEMail ) return TRUE;
- nodeMail = g_list_next( nodeMail );
- }
- }
- }
- node = g_list_next( node );
- }
- return FALSE;
-}
-
/*
* Search for new email record in copied email list.
* Enter: copyList List of copied email address mappings.
GList *node;
cnt = 0;
- while( node = fromPerson->listEMail ) {
+ while( (node = fromPerson->listEMail) != NULL ) {
ItemEMail *email;
email = node->data;
ItemObjectType addressbook_type2item( AddressObjectType abType ) {
ItemObjectType ioType;
- ioType = ITEMTYPE_NONE;
switch( abType ) {
case ADDR_ITEM_PERSON: ioType = ITEMTYPE_PERSON; break;
case ADDR_ITEM_EMAIL: ioType = ITEMTYPE_EMAIL; break;
case ADDR_ITEM_FOLDER: ioType = ITEMTYPE_FOLDER; break;
case ADDR_ITEM_GROUP: ioType = ITEMTYPE_GROUP; break;
case ADDR_DATASOURCE: ioType = ITEMTYPE_DATASOURCE; break;
+ default: ioType = ITEMTYPE_NONE; break;
}
return ioType;
}
fputc('\n', fp);
}
break;
+ default:
+ debug_print("Tried to write attachment in unsupported encoding type\n");
+ break;
}
fclose(attach_fp);
#include <stdlib.h>
#include <signal.h>
#include <time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
static GtkWidget *crash_dialog_show (const gchar *text,
const gchar *debug_output);
-static gboolean crash_create_debugger_file (void);
+static void crash_create_debugger_file (void);
static void crash_save_crash_log (GtkButton *, const gchar *);
static void crash_create_bug_report (GtkButton *, const gchar *);
static void crash_debug (unsigned long crash_pid,
GtkWidget *button3;
GtkWidget *button4;
GtkWidget *button5;
- GtkWidget *pixwid;
- GdkPixmap *pix;
- GdkBitmap *msk;
gchar *crash_report;
window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL);
* all the other options (creating temp files) looked too
* convoluted.
*/
-static gboolean crash_create_debugger_file(void)
+static void crash_create_debugger_file(void)
{
gchar *filespec = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, DEBUGGERRC, NULL);
static ERTFState ertf_read_line (ERTFParser *parser);
static void ertf_append_char (ERTFParser *parser,
gchar ch);
-static void ertf_append_str (ERTFParser *parser,
- const gchar *str,
- gint len);
static ERTFState ertf_parse_tag (ERTFParser *parser);
static void ertf_get_parenthesis (ERTFParser *parser,
parser->newline = FALSE;
}
-static void ertf_append_str(ERTFParser *parser, const gchar *str, gint len)
-{
- GString *string = parser->str;
-
- if (!parser->pre && parser->space) {
- g_string_append_c(string, ' ');
- parser->space = FALSE;
- }
-
- if (len == 0) return;
- if (len < 0)
- g_string_append(string, str);
- else {
- gchar *s;
- Xstrndup_a(s, str, len, return);
- g_string_append(string, s);
- }
-
- parser->empty_line = FALSE;
- if (string->len > 0 && string->str[string->len - 1] == '\n') {
- parser->newline = TRUE;
- if (string->len > 1 && string->str[string->len - 2] == '\n')
- parser->empty_line = TRUE;
- } else
- parser->newline = FALSE;
-}
-
static ERTFState ertf_parse_tag(ERTFParser *parser)
{
gchar buf[ERTFBUFSIZE];
tt = time( NULL );
fprintf( htmlFile, "<p>%s</p>\n", ctime( &tt ) );
- fprintf( htmlFile, "<hr width=\"100\%\"></hr>\n" );
+ fprintf( htmlFile, "<hr width=\"100%%\"></hr>\n" );
fprintf( htmlFile, "</body>\n" );
fprintf( htmlFile, "</html>\n" );
return TRUE;
default:
- return FALSE;
+ break;
}
+ return FALSE;
}
static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *info)
GHashTable *foldertable)
{
gboolean result;
- gchar actionstr;
gchar buf[50];
if (FALSE == (result = filteringaction_apply(filtering->action, info, foldertable))) {
FolderItem *item = (FolderItem *)node->data;
folder_item_restore_persist_prefs(item, pptable);
+
+ return FALSE;
}
void folder_scan_tree(Folder *folder)
g_return_val_if_fail(folder != NULL, NULL);
- if (FOLDER_TYPE(folder) == F_MH)
- path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
- else if (FOLDER_TYPE(folder) == F_MBOX) {
- path = mbox_get_virtual_path(folder);
- if (path == NULL)
- return NULL;
- path = g_strconcat(get_mbox_cache_dir(),
- G_DIR_SEPARATOR_S, path, NULL);
- return path;
- }
- else if (FOLDER_TYPE(folder) == F_IMAP) {
- g_return_val_if_fail(folder->account != NULL, NULL);
- path = g_strconcat(get_imap_cache_dir(),
- G_DIR_SEPARATOR_S,
- folder->account->recv_server,
- G_DIR_SEPARATOR_S,
- folder->account->userid,
- NULL);
- } else if (FOLDER_TYPE(folder) == F_NEWS) {
- g_return_val_if_fail(folder->account != NULL, NULL);
- path = g_strconcat(get_news_cache_dir(),
- G_DIR_SEPARATOR_S,
- folder->account->nntp_server,
- NULL);
- } else
- path = NULL;
+ switch(FOLDER_TYPE(folder)) {
+
+ case F_MH:
+ path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
+ break;
+
+ case F_IMAP:
+ g_return_val_if_fail(folder->account != NULL, NULL);
+ path = g_strconcat(get_imap_cache_dir(),
+ G_DIR_SEPARATOR_S,
+ folder->account->recv_server,
+ G_DIR_SEPARATOR_S,
+ folder->account->userid,
+ NULL);
+ break;
+
+ case F_NEWS:
+ g_return_val_if_fail(folder->account != NULL, NULL);
+ path = g_strconcat(get_news_cache_dir(),
+ G_DIR_SEPARATOR_S,
+ folder->account->nntp_server,
+ NULL);
+ break;
+ default:
+ path = NULL;
+ break;
+ }
+
return path;
}
g_return_val_if_fail(item != NULL, NULL);
- folder_path = folder_get_path(item->folder);
- g_return_val_if_fail(folder_path != NULL, NULL);
+ if(FOLDER_TYPE(item->folder) != F_MBOX) {
+ folder_path = folder_get_path(item->folder);
+ g_return_val_if_fail(folder_path != NULL, NULL);
- if (folder_path[0] == G_DIR_SEPARATOR) {
- if (item->path)
- path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
- item->path, NULL);
- else
- path = g_strdup(folder_path);
+ if (folder_path[0] == G_DIR_SEPARATOR) {
+ if (item->path)
+ path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strdup(folder_path);
+ } else {
+ if (item->path)
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, NULL);
+ }
+
+ g_free(folder_path);
} else {
- if (item->path)
- path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
- folder_path, G_DIR_SEPARATOR_S,
- item->path, NULL);
- else
- path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
- folder_path, NULL);
- }
+ gchar *itempath;
- g_free(folder_path);
+ itempath = mbox_get_virtual_path(item);
+ if (itempath == NULL)
+ return NULL;
+ path = g_strconcat(get_mbox_cache_dir(),
+ G_DIR_SEPARATOR_S, itempath, NULL);
+ g_free(itempath);
+ }
return path;
}
static void tree_sort (GtkCTree *ctree, GtkCTreeNode *node, gpointer data);
void gtk_sctree_sort_node (GtkCTree *ctree, GtkCTreeNode *node);
-static void real_sort_list (GtkCList *clist);
void gtk_sctree_sort_recursive (GtkCTree *ctree, GtkCTreeNode *node);
static void gtk_ctree_link (GtkCTree *ctree,
gtk_clist_thaw (clist);
}
-static void
-real_sort_list (GtkCList *clist)
-{
- gtk_sctree_sort_recursive (GTK_CTREE (clist), NULL);
-}
-
void
gtk_sctree_sort_node (GtkCTree *ctree,
GtkCTreeNode *node)
static void gtk_shruler_class_init (GtkSHRulerClass *klass);
static void gtk_shruler_init (GtkSHRuler *hruler);
-static gint gtk_shruler_motion_notify (GtkWidget *widget,
- GdkEventMotion *event);
static void gtk_shruler_draw_ticks (GtkRuler *ruler);
#if 0
static void gtk_shruler_draw_pos (GtkRuler *ruler);
case A_LOCAL:
inc_spool_account(account);
return 1;
+
+ default:
+ break;
}
return 0;
}
static void prefs_common_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void prefs_filter_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
static void prefs_template_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
prefs_common_open();
}
-static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
- GtkWidget *widget)
-{
- prefs_filter_open(NULL, NULL);
-}
-
static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
gchar * criteria_str;
gchar * matchtype_str;
int i;
- gchar * p;
- gint count;
- gchar * expr_str;
- gchar * out;
criteria_str = NULL;
for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
{
gchar *rcpath;
PrefFile *pfile;
- GSList *cur;
- ScoringProp * prop;
debug_print("Writing matcher configuration...\n");
%{
+#include <string.h>
+#include <glib.h>
+
#include "matcher_parser_lex.h"
#include "matcher_parser_parse.h"
-#include <glib.h>
#define MAX_STR_CONST 512
%token <str> MATCHER_STRING
%token <str> MATCHER_SECTION
-%token <value> MATCHER_INTEGER
+%token <str> MATCHER_INTEGER
%%
= mbox_check_msgnum_validity;
}
-static gchar * mbox_folder_create_parent(const gchar * path)
+static void mbox_folder_create_parent(const gchar * path)
{
if (!is_file_exist(path)) {
gchar * new_path;
mbox_cache_table = g_hash_table_new(g_str_hash, g_str_equal);
}
-static void mbox_cache_done()
-{
- g_hash_table_destroy(mbox_cache_table);
-}
-
static void mbox_cache_free_mbox(mboxcache * cache)
{
g_hash_table_remove(mbox_cache_table, cache->filename);
return cache->mf->count;
}
-static gint mbox_cache_get_mtime(gchar * filename)
-{
- mboxcache * cache;
-
- cache = mbox_cache_get_mbox(filename);
- if (cache == NULL)
- return -1;
- return cache->mtime;
-}
-
static GList * mbox_cache_get_msg_list(gchar * filename)
{
mboxcache * cache;
}
if (scan_new) {
- GList * l;
-
/*
if (strstr(filename, "trash") == 0)
printf("old_cache: %p %s\n", old_cache, filename);
Folder * src_folder;
gchar * filename;
gint num;
- gchar * destdir;
- gchar * mbox_path;
- struct _message * msg;
CopyFlagsInfo * flags_info;
src_folder = msginfo->folder->folder;
return folder;
}
-void mh_folder_destroy(MHFolder *folder)
+void mh_folder_destroy(Folder *folder)
{
folder_local_folder_destroy(LOCAL_FOLDER(folder));
}
Folder *mh_folder_new (const gchar *name,
const gchar *path);
-void mh_folder_destroy (MHFolder *folder);
+void mh_folder_destroy (Folder *folder);
#endif /* __MH_H__ */
gint news_post (Folder *folder,
const gchar *file);
-gint news_cancel_article(Folder * folder, MsgInfo * msginfo);
+gint news_cancel_article (Folder *folder,
+ MsgInfo *msginfo);
#endif /* __NEWS_H__ */
gpointer user_data);
static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
gpointer user_data);
-static void prefs_account_smtp_userid_cb(GtkEditable *editable,
- gpointer smtp_passwd);
static PrefParam param[] = {
/* Basic */
static void prefs_receive_create (void);
static void prefs_send_create (void);
static void prefs_compose_create (void);
-static void prefs_spelling_create (void);
static void prefs_quote_create (void);
static void prefs_display_create (void);
static void prefs_message_create (void);
gint row = 0;
GtkCList *clist = GTK_CLIST(toolbar.clist_set);
gchar *entry = NULL;
- GSList *toolbar_list = NULL;
toolbar_clear_list(toolbar.source);
bufsize += len;
}
-static void flush_buffer(void)
-{
- if (buffer != NULL)
- *buffer = '\0';
- bufsize = 0;
-}
-
gchar *quote_fmt_get_buffer(void)
{
if (error != 0)
FILE *file;
char buffer[256];
- if(file = fopen($3, "rb")) {
+ if((file = fopen($3, "rb")) != NULL) {
while(fgets(buffer, sizeof(buffer), file)) {
INSERT(buffer);
}
FILE *file;
char buffer[256];
- if(file = popen($3, "r")) {
+ if((file = popen($3, "r")) != NULL) {
while(fgets(buffer, sizeof(buffer), file)) {
INSERT(buffer);
}
#include "utils.h"
#include "gtkutils.h"
#include "statusbar.h"
+#include "inc.h"
typedef struct _SendProgressDialog SendProgressDialog;
return entry;
}
-static void string_entry_free(StringEntry *entry)
-{
- g_return_if_fail(entry != NULL);
- g_return_if_fail(entry->string);
-
- g_free(entry->string);
- g_free(entry);
-}
-
StringTable *string_table_new(void)
{
StringTable *strtable;
#include "filtering.h"
#include "string_match.h"
#include "toolbar.h"
+#include "news.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_UNREAD_WIDTH 13