[Commits] smtp.c 1.11.2.32 1.11.2.33 smtp.h 1.6.2.21 1.6.2.22

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/common
In directory srv:/tmp/cvs-serv13676/src/common

Modified Files:
      Tag: gtk2
	smtp.c smtp.h 
Log Message:
2012-10-10 [colin]	3.8.1cvs90

	* src/inc.c
	* src/mbox.c
	* src/common/smtp.c
	* src/common/smtp.h
		Fix bug #2639, "The MSGBUFSIZE definition collides with a definition of OpenBSD"
		Patch by "madroach"

Index: smtp.h
===================================================================
RCS file: /home/claws-mail/claws/src/common/smtp.h,v
retrieving revision 1.6.2.21
retrieving revision 1.6.2.22
diff -u -d -r1.6.2.21 -r1.6.2.22
--- smtp.h	7 Jul 2012 07:30:56 -0000	1.6.2.21
+++ smtp.h	10 Oct 2012 08:12:10 -0000	1.6.2.22
@@ -32,7 +32,7 @@
 
 #define SMTP_SESSION(obj)	((SMTPSession *)obj)
 
-#define MSGBUFSIZE		8192
+#define MESSAGEBUFSIZE		8192
 
 typedef enum
 {

Index: smtp.c
===================================================================
RCS file: /home/claws-mail/claws/src/common/smtp.c,v
retrieving revision 1.11.2.32
retrieving revision 1.11.2.33
diff -u -d -r1.11.2.32 -r1.11.2.33
--- smtp.c	7 Jul 2012 07:09:31 -0000	1.11.2.32
+++ smtp.c	10 Oct 2012 08:12:10 -0000	1.11.2.33
@@ -125,7 +125,7 @@
 
 gint smtp_from(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	gchar *mail_size = NULL;
 
 	cm_return_val_if_fail(session->from != NULL, SM_ERROR);
@@ -189,7 +189,7 @@
 
 static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	switch (session->auth_type) {
 	case SMTPAUTH_LOGIN:
@@ -265,7 +265,7 @@
 
 static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	session->state = SMTP_AUTH_LOGIN_PASS;
 
@@ -285,7 +285,7 @@
 
 static gint smtp_ehlo(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	session->state = SMTP_EHLO;
 
@@ -364,7 +364,7 @@
 
 static gint smtp_auth_plain(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	/* 
  	 * +1      +1      +1
@@ -429,7 +429,7 @@
 
 static gint smtp_helo(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	session->state = SMTP_HELO;
 
@@ -444,7 +444,7 @@
 
 static gint smtp_rcpt(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	gchar *to;
 
 	cm_return_val_if_fail(session->cur_to != NULL, SM_ERROR);