masqmail

changeset 349:b45dc53f2829

find changesets by author, revision, files, or words in the commit message
Removed unused second arg of msg_spool_read()
author markus schnalke <meillo@marmaro.de>
date Thu, 14 Jul 2011 11:38:23 +0200
parents a7a387253b2f
children 332999b1303f
files src/masqmail.c src/masqmail.h src/queue.c src/spool.c
diffstat 4 files changed, 5 insertions(+), 11 deletions(-) [+]
line diff
     1.1 --- a/src/masqmail.c	Thu Jul 14 11:31:52 2011 +0200
     1.2 +++ b/src/masqmail.c	Thu Jul 14 11:38:23 2011 +0200
     1.3 @@ -343,7 +343,7 @@
     1.4  
     1.5  	/* non-privileged users may only delete their own messages */
     1.6  	for (; *id; id++) {
     1.7 -		message *msg = msg_spool_read(*id, FALSE);
     1.8 +		message *msg = msg_spool_read(*id);
     1.9  
    1.10  		fprintf(stderr, "id: %s\n", *id);
    1.11  

     2.1 --- a/src/masqmail.h	Thu Jul 14 11:31:52 2011 +0200
     2.2 +++ b/src/masqmail.h	Thu Jul 14 11:38:23 2011 +0200
     2.3 @@ -450,7 +450,7 @@
     2.4  
     2.5  /* spool.c */
     2.6  gboolean spool_read_data(message * msg);
     2.7 -message *msg_spool_read(gchar * uid, gboolean do_readdata);
     2.8 +message *msg_spool_read(gchar * uid);
     2.9  gboolean spool_write(message * msg, gboolean do_writedata);
    2.10  gboolean spool_lock(gchar * uid);
    2.11  gboolean spool_unlock(gchar * uid);

     3.1 --- a/src/queue.c	Thu Jul 14 11:31:52 2011 +0200
     3.2 +++ b/src/queue.c	Thu Jul 14 11:38:23 2011 +0200
     3.3 @@ -76,7 +76,7 @@
     3.4  
     3.5  		DEBUG(5) debugf("uid: %s\n", uid);
     3.6  
     3.7 -		msg_list = g_list_append(msg_list, msg_spool_read(uid, FALSE));
     3.8 +		msg_list = g_list_append(msg_list, msg_spool_read(uid));
     3.9  
    3.10  		DEBUG(5) debugf("after read spool file for %s\n", uid);
    3.11  

     4.1 --- a/src/spool.c	Thu Jul 14 11:31:52 2011 +0200
     4.2 +++ b/src/spool.c	Thu Jul 14 11:38:23 2011 +0200
     4.3 @@ -201,7 +201,7 @@
     4.4  }
     4.5  
     4.6  message*
     4.7 -msg_spool_read(gchar * uid, gboolean do_readdata)
     4.8 +msg_spool_read(gchar * uid)
     4.9  {
    4.10  	message *msg;
    4.11  	gboolean ok = FALSE;
    4.12 @@ -212,13 +212,7 @@
    4.13  	DEBUG(4) debugf("msg_spool_read():\n");
    4.14  	/* header spool: */
    4.15  	ok = spool_read_header(msg);
    4.16 -	DEBUG(4) debugf("  spool_read_header() returned: %d (do_readdata had been: %d)\n",
    4.17 -	                ok, do_readdata);
    4.18 -	if (ok && do_readdata) {
    4.19 -		/* data spool: */
    4.20 -		ok = spool_read_data(msg);
    4.21 -		DEBUG(4) debugf("  spool_read_data() returned: %d\n", ok);
    4.22 -	}
    4.23 +	DEBUG(4) debugf("  spool_read_header() returned: %d\n", ok);
    4.24  	return msg;
    4.25  }
    4.26