From 26eee7328031f78b063ab71265ef4fddc8619c72 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@src.gnome.org>
Date: Mon, 11 Dec 2000 23:01:26 +0000
Subject: Fix fucking CVS conflicts because fucking CVS is a fucking big doofus
 - Federico

svn path=/trunk/; revision=6920
---
 libical/src/libicalvcal/vcc.y | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

(limited to 'libical/src/libicalvcal/vcc.y')

diff --git a/libical/src/libicalvcal/vcc.y b/libical/src/libicalvcal/vcc.y
index 1c800990c4..70feefab57 100644
--- a/libical/src/libicalvcal/vcc.y
+++ b/libical/src/libicalvcal/vcc.y
@@ -161,7 +161,6 @@ enum LexMode {
 /****  Private Forward Declarations  ****/
 static int pushVObject(const char *prop);
 static VObject* popVObject();
-static char* lexDataFromBase64();
 static void lexPopMode(int top);
 static int lexWithinMode(enum LexMode mode);
 static void lexPushMode(enum LexMode mode);
@@ -370,7 +369,6 @@ todoitem:
 	;
 
 %%
-/*/////////////////////////////////////////////////////////////////////////*/
 static int pushVObject(const char *prop)
     {
     VObject *newObj;
@@ -390,7 +388,6 @@ static int pushVObject(const char *prop)
     }
 
 
-/*/////////////////////////////////////////////////////////////////////////*/
 /* This pops the recently built vCard off the stack and returns it. */
 static VObject* popVObject()
     {
@@ -631,22 +628,6 @@ static char* lexGetWord() {
     return lexStr();
     }
 
-static void lexPushLookahead(char *s, int len) {
-    int putptr;
-    if (len == 0) len = strlen(s);
-    putptr = (int)lexBuf.getPtr - len;
-    /* this function assumes that length of word to push back
-     /  is not greater than MAX_LEX_LOOKAHEAD.
-     */
-    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
-    lexBuf.getPtr = putptr;
-    while (*s) {
-	lexBuf.buf[putptr] = *s++;
-	putptr = (putptr + 1) % MAX_LEX_LOOKAHEAD;
-	}
-    lexBuf.len += len;
-    }
-
 static void lexPushLookaheadc(int c) {
     int putptr;
     /* can't putback EOF, because it never leaves lookahead buffer */
@@ -725,7 +706,6 @@ static void handleMoreRFC822LineBreak(int c) {
     }
 
 static char* lexGet1Value() {
-    int size = 0;
     int c;
     lexSkipWhite();
     c = lexLookahead();
@@ -756,18 +736,6 @@ static char* lexGet1Value() {
     }
 #endif
 
-static char* lexGetStrUntil(char *termset) {
-    int size = 0;
-    int c = lexLookahead();
-    lexClearToken();
-    while (c != EOF && !strchr(termset,c)) {
-	lexAppendc(c);
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    return c==EOF?0:lexStr();
-    }
 
 static int match_begin_name(int end) {
     char *n = lexLookaheadWord();
@@ -813,7 +781,6 @@ static void finiLex() {
     }
 
 
-/*/////////////////////////////////////////////////////////////////////////*/
 /* This parses and converts the base64 format for binary encoding into
  * a decoded buffer (allocated with new).  See RFC 1521.
  */
@@ -942,7 +909,6 @@ static int match_begin_end_name(int end) {
 static char* lexGetQuotedPrintable()
     {
     char cur;
-    unsigned long len = 0;
 
     lexClearToken();
     do {
@@ -998,7 +964,6 @@ EndString:
     } /* LexQuotedPrintable */
 
 int yylex() {
-    int token = 0;
 
     int lexmode = LEXMODE();
     if (lexmode == L_VALUES) {
@@ -1131,7 +1096,6 @@ static VObject* Parse_MIMEHelper()
     return vObjList;
     }
 
-/*/////////////////////////////////////////////////////////////////////////*/
 DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
     {
     initLex(input, len, 0);
@@ -1186,12 +1150,6 @@ DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
 
 #endif
 
-/*/////////////////////////////////////////////////////////////////////////*/
-static void YYDebug(const char *s)
-{
-/*	Parse_Debug(s); */
-}
-
 
 static MimeErrorHandler mimeErrorHandler;
 
-- 
cgit