General cleanup of camel debug printfs.

2001-09-19    <NotZed@Ximian.com>

        * General cleanup of camel debug printfs.

        * camel-lock.c (camel_lock_fcntl): Changed to return 'success' if
        the error indicates file locking isn't supported on this
        filesystem.  Still return a warning just incase (if its the first
        time).  Might fix a lot of reported bugs.

        * providers/local/camel-spool-store.c (get_folder_info): Dont
        include the empty // host part in the uri.  This 'breaks' the
        service lookup.

svn path=/trunk/; revision=12973

5 files changed, 12 insertions, 10 deletions

diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 43437b551a..20f90ce315 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -191,7 +191,7 @@ get_folder_info (CamelStore *store, const char *top,
 	 * there before.
 	 */
 
-	printf("-- LOCAL STRE -- get folder info: %s\n", top);
+	d(printf("-- LOCAL STRE -- get folder info: %s\n", top));
 
 	return NULL;
 }
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 927c194089..09188ad863 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -36,6 +36,8 @@
 #include "camel-exception.h"
 #include "camel-url.h"
 
+#define d(x)
+
 static CamelLocalStoreClass *parent_class = NULL;
 
 /* Returns the class for a CamelMaildirStore */
@@ -245,7 +247,7 @@ static int scan_dir(GHashTable *visited, char *root, const char *path, guint32 f
 	/* look for folders matching the right structure, recursively */
 	name = g_strdup_printf("%s/%s", root, path);
 
-	printf("checking dir '%s' part '%s' for maildir content\n", root, path);
+	d(printf("checking dir '%s' part '%s' for maildir content\n", root, path));
 
 	tmp = g_strdup_printf("%s/tmp", name);
 	cur = g_strdup_printf("%s/cur", name);
@@ -265,8 +267,8 @@ static int scan_dir(GHashTable *visited, char *root, const char *path, guint32 f
 		base = path;
 	fi = camel_folder_info_new(uri, path, base, -1);
 	
-	printf("found! uri = %s\n", fi->url);
-	printf("  full_name = %s\n  name = '%s'\n", fi->full_name, fi->name);
+	d(printf("found! uri = %s\n", fi->url));
+	d(printf("  full_name = %s\n  name = '%s'\n", fi->full_name, fi->name));
 	
 	fi->parent = parent;
 	fi->sibling = *fip;
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index d1c9c311e5..3d6dfc5378 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -250,7 +250,7 @@ summary_rebuild(CamelMboxSummary *mbs, off_t offset, CamelException *ex)
 
 	fd = open(cls->folder_path, O_RDONLY);
 	if (fd == -1) {
-		printf("%s failed to open: %s\n", cls->folder_path, strerror(errno));
+		d(printf("%s failed to open: %s\n", cls->folder_path, strerror(errno)));
 		camel_exception_setv(ex, 1, _("Could not open folder: %s: %s"),
 				     cls->folder_path, strerror(errno));
 		camel_operation_end(NULL);
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index 600ee8b2bc..998c97597c 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -99,8 +99,8 @@ construct (CamelService *service, CamelSession *session, CamelProvider *provider
 	char *path, *name;
 	struct stat st;
 
-	printf("constructing store of type %s '%s:%s'\n",
-	       camel_type_to_name(((CamelObject *)service)->s.type), url->protocol, url->path);
+	d(printf("constructing store of type %s '%s:%s'\n",
+		 camel_type_to_name(((CamelObject *)service)->s.type), url->protocol, url->path));
 
 	CAMEL_SERVICE_CLASS (parent_class)->construct (service, session, provider, url, ex);
 	if (camel_exception_is_set (ex))
@@ -150,7 +150,7 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 	char *path = ((CamelService *)store)->url->path;
 	CamelFolder *folder;
 
-	printf("opening folder %s on path %s\n", folder_name, path);
+	d(printf("opening folder %s on path %s\n", folder_name, path));
 
 	/* we only support an 'INBOX' */
 	if (strcmp(folder_name, "INBOX") != 0) {
@@ -192,7 +192,7 @@ get_folder_info (CamelStore *store, const char *top,
 		fi = g_malloc0(sizeof(*fi));
 		fi->full_name = "/INBOX";
 		fi->name = "INBOX";
-		fi->url = g_strdup_printf("spool://%s#%s", service->url->path, fi->name);
+		fi->url = g_strdup_printf("spool:%s#%s", service->url->path, fi->name);
 		fi->unread_message_count = -1;
 	}
 
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index 651ce7b0e9..db05f602ef 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -380,7 +380,7 @@ summary_rebuild(CamelSpoolSummary *cls, off_t offset, CamelException *ex)
 
 	fd = open(cls->folder_path, O_RDONLY);
 	if (fd == -1) {
-		printf("%s failed to open: %s\n", cls->folder_path, strerror(errno));
+		d(printf("%s failed to open: %s\n", cls->folder_path, strerror(errno)));
 		camel_exception_setv(ex, 1, _("Could not open folder: %s: summarising from position %ld: %s"),
 				     cls->folder_path, offset, strerror(errno));
 		camel_operation_end(NULL);