2003-07-09 Jeffrey Stedfast <fejj@ximian.com>
- * camel-block-file.c: Get rid of the #ifdef ENABLE_THREADS since
+ Get rid of the #ifdef ENABLE_THREADS since
we no longer plan to support/maintain this.
+ * providers/nntp/camel-nntp-store.c: Here.
+
+ * providers/nntp/camel-nntp-newsrc.c: And here.
+
+ * providers/nntp/camel-nntp-folder.c: Same.
+
+ * providers/local/camel-local-folder.c: And here.
+
+ * camel-block-file.c: Here too.
+
* camel.c: Same.
* camel-certdb.c: Here too.
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Authors: Michael Zucchi <notzed@ximian.com>
*
- * Copyright (C) 1999, 2003 Ximian Inc.
+ * Copyright 1999-2003 Ximian, Inc. (www.ximian.com)
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
local_folder->search = NULL;
local_folder->priv = g_malloc0(sizeof(*local_folder->priv));
-#ifdef ENABLE_THREADS
local_folder->priv->search_lock = g_mutex_new();
-#endif
}
static void
g_free(local_folder->index_path);
camel_folder_change_info_free(local_folder->changes);
-
-#ifdef ENABLE_THREADS
+
g_mutex_free(local_folder->priv->search_lock);
-#endif
+
g_free(local_folder->priv);
}
-CamelType camel_local_folder_get_type(void)
+CamelType
+camel_local_folder_get_type(void)
{
static CamelType camel_local_folder_type = CAMEL_INVALID_TYPE;
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- * camel-local-private.h: Private info for local provider.
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Authors: Michael Zucchi <notzed@ximian.com>
*
- * Authors: Michael Zucchi <notzed@ximian.com>
+ * Copyright 1999-2003 Ximian, Inc. (www.ximian.com)
*
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
*/
-#ifndef CAMEL_PRIVATE_H
-#define CAMEL_PRIVATE_H 1
+
+#ifndef CAMEL_LOCAL_PRIVATE_H
+#define CAMEL_LOCAL_PRIVATE_H 1
#ifdef __cplusplus
extern "C" {
#pragma }
-#endif /* __cplusplus }*/
+#endif /* __cplusplus */
/* need a way to configure and save this data, if this header is to
be installed. For now, dont install it */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
-#ifdef ENABLE_THREADS
#include <pthread.h>
-#endif
struct _CamelLocalFolderPrivate {
-#ifdef ENABLE_THREADS
GMutex *search_lock; /* for locking the search object */
-#endif
};
-#ifdef ENABLE_THREADS
#define CAMEL_LOCAL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelLocalFolder *)f)->priv->l))
#define CAMEL_LOCAL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelLocalFolder *)f)->priv->l))
-#else
-#define CAMEL_LOCAL_FOLDER_LOCK(f, l)
-#define CAMEL_LOCAL_FOLDER_UNLOCK(f, l)
-#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* CAMEL_H */
+#endif /* CAMEL_LOCAL_PRIVATE_H */
* Authors : Chris Toshok <toshok@ximian.com>
* Michael Zucchi <notzed@ximian.com>
*
- * Copyright (C) 2001 Ximian .
+ * Copyright (C) 2001-2003 Ximian, Inc. (www.ximian.com)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
*/
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
-#include <dirent.h>
#include <sys/stat.h>
+#include <dirent.h>
#include <unistd.h>
-#include <errno.h>
-#include <string.h>
#include <fcntl.h>
+#include <errno.h>
#include "camel/camel-file-utils.h"
#include "camel/camel-stream-mem.h"
#include "camel-nntp-store.h"
#include "camel-nntp-private.h"
-static CamelFolderClass *parent_class=NULL;
+static CamelFolderClass *parent_class = NULL;
/* Returns the class for a CamelNNTPFolder */
#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
struct _CamelNNTPFolderPrivate *p;
nntp_folder->changes = camel_folder_change_info_new();
-#ifdef ENABLE_THREADS
p = nntp_folder->priv = g_malloc0(sizeof(*nntp_folder->priv));
p->search_lock = g_mutex_new();
p->cache_lock = g_mutex_new();
-#endif
}
static void
struct _CamelNNTPFolderPrivate *p;
g_free(nntp_folder->storage_path);
-#ifdef ENABLE_THREADS
+
p = nntp_folder->priv;
g_mutex_free(p->search_lock);
g_mutex_free(p->cache_lock);
g_free(p);
-#endif
}
static void
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-newsrc.c - .newsrc parsing/regurgitating code */
-/*
+/*
+ * Authors: Chris Toshok <toshok@ximian.com>
*
- * Copyright (C) 2000 Ximian, Inc. <toshok@ximian.com>
+ * Copyright 2000-2003 Ximian, Inc. (www.ximian.com)
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
*/
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
+#include <glib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
-#include <fcntl.h>
+#include <pthread.h>
#include <unistd.h>
+#include <fcntl.h>
#include <errno.h>
+
#include "camel-nntp-newsrc.h"
#include <camel/camel-folder-summary.h>
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
#define NEWSRC_LOCK(f, l) (g_mutex_lock(((CamelNNTPNewsrc *)f)->l))
#define NEWSRC_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPNewsrc *)f)->l))
-#else
-#define NEWSRC_LOCK(f, l)
-#define NEWSRC_UNLOCK(f, l)
-#endif
typedef struct {
guint low;
gchar *filename;
GHashTable *groups;
gboolean dirty;
-#ifdef ENABLE_THREADS
GMutex *lock;
-#endif
-} ;
+};
static NewsrcGroup *
newsrc = g_new0(CamelNNTPNewsrc, 1);
newsrc->filename = filename;
newsrc->groups = g_hash_table_new (g_str_hash, g_str_equal);
-#ifdef ENABLE_THREADS
newsrc->lock = g_mutex_new();
-#endif
-
+
if ((fd = open(filename, O_RDONLY)) == -1) {
g_warning ("~/.newsrc-%s not present.\n", server);
return newsrc;
#ifdef __cplusplus
extern "C" {
#pragma }
-#endif /* __cplusplus }*/
+#endif /* __cplusplus */
/* need a way to configure and save this data, if this header is to
be installed. For now, dont install it */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
-#ifdef ENABLE_THREADS
#include "e-util/e-msgport.h"
-#endif
struct _CamelNNTPStorePrivate {
-#ifdef ENABLE_THREADS
EMutex *command_lock; /* for locking the command stream for a complete operation */
-#endif
};
-#ifdef ENABLE_THREADS
#define CAMEL_NNTP_STORE_LOCK(f, l) (e_mutex_lock(((CamelNNTPStore *)f)->priv->l))
#define CAMEL_NNTP_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelNNTPStore *)f)->priv->l))
-#else
-#define CAMEL_NNTP_STORE_LOCK(f, l)
-#define CAMEL_NNTP_STORE_UNLOCK(f, l)
-#endif
+
struct _CamelNNTPFolderPrivate {
-#ifdef ENABLE_THREADS
GMutex *search_lock; /* for locking the search object */
GMutex *cache_lock; /* for locking the cache object */
-#endif
};
-#ifdef ENABLE_THREADS
#define CAMEL_NNTP_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelNNTPFolder *)f)->priv->l))
#define CAMEL_NNTP_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPFolder *)f)->priv->l))
#else
#define CAMEL_NNTP_FOLDER_LOCK(f, l)
#define CAMEL_NNTP_FOLDER_UNLOCK(f, l)
-#endif
#ifdef __cplusplus
}
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-store.c : class for an nntp store */
-
/*
*
- * Copyright (C) 2001 Ximian, Inc. <www.ximain.com>
+ * Copyright (C) 2001-2003 Ximian, Inc. <www.ximain.com>
*
* Authors: Christopher Toshok <toshok@ximian.com>
* Michael Zucchi <notzed@ximian.com>
#include <config.h>
#endif
-#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include <unistd.h>
+#include <dirent.h>
+#include <errno.h>
#include <camel/camel-url.h>
#include <camel/string-utils.h>
nntp_store->mem = NULL;
if (nntp_store->stream)
camel_object_unref((CamelObject *)nntp_store->stream);
-
-#ifdef ENABLE_THREADS
+
e_mutex_destroy(p->command_lock);
-#endif
+
g_free(p);
}
nntp_store->mem = (CamelStreamMem *)camel_stream_mem_new();
p = nntp_store->priv = g_malloc0(sizeof(*p));
-#ifdef ENABLE_THREADS
p->command_lock = e_mutex_new(E_MUTEX_REC);
-#endif
}
CamelType
}
/* enter owning lock */
-int camel_nntp_store_set_folder(CamelNNTPStore *store, CamelFolder *folder, CamelFolderChangeInfo *changes, CamelException *ex)
+int
+camel_nntp_store_set_folder (CamelNNTPStore *store, CamelFolder *folder, CamelFolderChangeInfo *changes, CamelException *ex)
{
int ret;
projects / platform / upstream / evolution-data-server.git / commitdiff