Fixed some warnings. Fixed a bug where quoted printable fields were

2000-09-22  Christopher James Lahey  <clahey@helixcode.com>

	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
	printable fields were reading in semi-colons that should have been
	field separators.

From addressbook/ChangeLog:

2000-09-22  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/e-card.c: Made addresses be quoted printable again
	so that they will encode properly if they have carriage returns in
	them.  This is possible now because of a fix in libversit.

svn path=/trunk/; revision=5550

4 files changed, 40 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 748e7e80d5..a082bc3d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
 
+	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
+	printable fields were reading in semi-colons that should have been
+	field separators.
+
+2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
+
 	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.
 
 	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 30b8213aef..5035203a79 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
 2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
 
+	* backend/ebook/e-card.c: Made addresses be quoted printable again
+	so that they will encode properly if they have carriage returns in
+	them.  This is possible now because of a fix in libversit.
+
+2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
+
 	* backend/ebook/e-book-view-listener.c,
 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index e18dc681ec..3ffa8368ed 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -301,9 +301,7 @@ char
 				addPropValue(addressprop, VCPostalCodeProp, address->code);
 			if ( address->country )
 				addPropValue(addressprop, VCCountryNameProp, address->country);
-#if 0
 			addProp(addressprop, VCQuotedPrintableProp);
-#endif
 		}
 		gtk_object_unref(GTK_OBJECT(iterator));
 	}
diff --git a/libversit/vcc.y b/libversit/vcc.y
index f8eb9e6556..a8c7f2883e 100644
--- a/libversit/vcc.y
+++ b/libversit/vcc.y
@@ -115,6 +115,9 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #include <ctype.h>
 #include "vcc.h"
 
+static int yylex(void);
+static void yyerror(char *s);
+
 /****  Types, Constants  ****/
 
 #define YYDEBUG		1	/* 1 to compile in some debugging code */
@@ -145,7 +148,7 @@ extern "C" {
     };
 #endif
 
-int yyparse();
+int yyparse(void);
 
 enum LexMode {
 	L_NORMAL,
@@ -160,14 +163,18 @@ enum LexMode {
 
 /****  Private Forward Declarations  ****/
 static int pushVObject(const char *prop);
-static VObject* popVObject();
-static char* lexDataFromBase64();
+static VObject* popVObject(void);
+#ifndef _SUPPORT_LINE_FOLDING
+static char* lexDataFromBase64(void);
+#endif
 static void lexPopMode(int top);
 static int lexWithinMode(enum LexMode mode);
 static void lexPushMode(enum LexMode mode);
 static void enterProps(const char *s);
 static void enterAttr(const char *s1, const char *s2);
+#if 0
 static void enterValues(const char *value);
+#endif
 static void mime_error_(char *s);
  static void appendValue(const char *value);
 
@@ -371,7 +378,7 @@ todoitem:
 	;
 
 %%
-/*/////////////////////////////////////////////////////////////////////////*/
+/* ///////////////////////////////////////////////////////////////////////// */
 static int pushVObject(const char *prop)
     {
     VObject *newObj;
@@ -391,7 +398,7 @@ static int pushVObject(const char *prop)
     }
 
 
-/*/////////////////////////////////////////////////////////////////////////*/
+/* ///////////////////////////////////////////////////////////////////////// */
 /* This pops the recently built vCard off the stack and returns it. */
 static VObject* popVObject()
     {
@@ -442,6 +449,7 @@ static void appendValue(const char *value)
   deleteStr(value);
 }
 
+#if 0
 static void enterValues(const char *value)
     {
     if (fieldedProp && *fieldedProp) {
@@ -458,6 +466,7 @@ static void enterValues(const char *value)
 	}
     deleteStr(value);
     }
+#endif
 
 static void enterProps(const char *s)
     {
@@ -467,7 +476,7 @@ static void enterProps(const char *s)
 
 static void enterAttr(const char *s1, const char *s2)
     {
-    const char *p1, *p2;
+    const char *p1, *p2 = NULL;
     p1 = lookupProp_(s1);
     if (s2) {
 	VObject *a;
@@ -667,6 +676,7 @@ static char* lexGetWord() {
     return lexStr();
     }
 
+#if 0
 static void lexPushLookahead(char *s, int len) {
     int putptr;
     if (len == 0) len = strlen(s);
@@ -682,6 +692,7 @@ static void lexPushLookahead(char *s, int len) {
 	}
     lexBuf.len += len;
     }
+#endif
 
 static void lexPushLookaheadc(int c) {
     int putptr;
@@ -761,7 +772,6 @@ static void handleMoreRFC822LineBreak(int c) {
     }
 
 static char* lexGet1Value() {
-    int size = 0;
     int c;
     lexSkipWhite();
     c = lexLookahead();
@@ -792,8 +802,8 @@ static char* lexGet1Value() {
     }
 #endif
 
+#ifndef _SUPPORT_LINE_FOLDING
 static char* lexGetStrUntil(char *termset) {
-    int size = 0;
     int c = lexLookahead();
     lexClearToken();
     while (c != EOF && !strchr(termset,c)) {
@@ -804,6 +814,7 @@ static char* lexGetStrUntil(char *termset) {
     lexAppendc(0);
     return c==EOF?0:lexStr();
     }
+#endif
 
 static int match_begin_name(int end) {
     char *n = lexLookaheadWord();
@@ -821,9 +832,9 @@ static int match_begin_name(int end) {
 
 
 #ifdef INCLUDEMFC
-void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
+static void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
 #else
-void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
+static void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
 #endif
     {
     /* initialize lex mode stack */
@@ -849,7 +860,7 @@ static void finiLex() {
     }
 
 
-/*/////////////////////////////////////////////////////////////////////////*/
+/* ///////////////////////////////////////////////////////////////////////// */
 /* This parses and converts the base64 format for binary encoding into
  * a decoded buffer (allocated with new).  See RFC 1521.
  */
@@ -978,7 +989,6 @@ static int match_begin_end_name(int end) {
 static char* lexGetQuotedPrintable()
     {
     char cur;
-    unsigned long len = 0;
 
     lexClearToken();
     do {
@@ -1016,8 +1026,10 @@ static char* lexGetQuotedPrintable()
 		    }
 		break;
 		} /* '=' */
-	    case '\n': {
-		lexPushLookaheadc('\n');
+	    case '\n':
+	    case ';':
+	      {
+		lexPushLookaheadc(cur);
 		goto EndString;
 		}
 	    case (char)EOF:
@@ -1034,8 +1046,6 @@ EndString:
     } /* LexQuotedPrintable */
 
 static int yylex() {
-    int token = 0;
-
     int lexmode = LEXMODE();
     if (lexmode == L_VALUES) {
 	int c = lexGetc();
@@ -1169,7 +1179,7 @@ static VObject* Parse_MIMEHelper()
     return vObjList;
     }
 
-/*/////////////////////////////////////////////////////////////////////////*/
+/* ///////////////////////////////////////////////////////////////////////// */
 DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
     {
     initLex(input, len, 0);
@@ -1224,12 +1234,7 @@ DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
 
 #endif
 
-/*/////////////////////////////////////////////////////////////////////////*/
-static void YYDebug(const char *s)
-{
-/*	Parse_Debug(s); */
-}
-
+/* ///////////////////////////////////////////////////////////////////////// */
 
 static MimeErrorHandler mimeErrorHandler;