1 files changed, 10 insertions, 13 deletions

diff --git a/libical/src/libical/sspm.c b/libical/src/libical/sspm.c
index 2df581b..17f12ee 100644
--- a/libical/src/libical/sspm.c
+++ b/libical/src/libical/sspm.c
@@ -32,36 +32,33 @@
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
  ======================================================================*/
 
 #include <stdio.h>
 #include <string.h>
 #include "sspm.h"
 #include <assert.h>
 #include <ctype.h> /* for tolower */
 #include <stdlib.h>   /* for malloc, free */
 #include <string.h> /* for strcasecmp */
 
-// Eugen C. <eug@thekompany.com>
-#ifdef _WIN32
-#define strcasecmp _stricmp
-#endif
-// Eugen C. <eug@thekompany.com>
-
-int snprintf(char *str, size_t n, char const *fmt, ...);
-
 #ifdef DMALLOC
 #include "dmalloc.h"
 #endif
 
+#ifdef WIN32
+#define snprintf      _snprintf
+#define strcasecmp    stricmp
+#endif
+
 #define TMP_BUF_SIZE 1024
 
 
 enum mime_state {
     UNKNOWN_STATE,
     IN_HEADER,
     END_OF_HEADER,
     IN_BODY,
     OPENING_PART,
     END_OF_PART,
     TERMINAL_END_OF_PART,
     END_OF_INPUT
@@ -84,44 +81,44 @@ void* sspm_make_multipart_part(struct mime_impl *impl,struct sspm_header *header
 void sspm_read_header(struct mime_impl *impl,struct sspm_header *header);
 
 char* sspm_strdup(char* str){
 
     char* s;
 
     s = strdup(str);
 
     return s;
 }
 
 
-struct  major_content_type_map 
+static struct  major_content_type_map 
 {
 	enum sspm_major_type type;
 	char* str;
 	
 } major_content_type_map[]  = 
 {
     {SSPM_MULTIPART_MAJOR_TYPE,"multipart" },
     {SSPM_TEXT_MAJOR_TYPE,"text" },
     {SSPM_TEXT_MAJOR_TYPE,"text" },
     {SSPM_IMAGE_MAJOR_TYPE,"image" },
     {SSPM_AUDIO_MAJOR_TYPE,"audio" },
     {SSPM_VIDEO_MAJOR_TYPE,"video" },
     {SSPM_APPLICATION_MAJOR_TYPE,"application" },
     {SSPM_MULTIPART_MAJOR_TYPE,"multipart" },
     {SSPM_MESSAGE_MAJOR_TYPE,"message" },
     {SSPM_UNKNOWN_MAJOR_TYPE,"" },
 };
 
-struct  minor_content_type_map 
+static struct  minor_content_type_map 
 {
 	enum sspm_minor_type type;
 	char* str;
 
 } minor_content_type_map[]  = 
 {
     {SSPM_ANY_MINOR_TYPE,"*" },
     {SSPM_PLAIN_MINOR_TYPE,"plain" },
     {SSPM_RFC822_MINOR_TYPE,"rfc822" },
     {SSPM_DIGEST_MINOR_TYPE,"digest" },
     {SSPM_CALENDAR_MINOR_TYPE,"calendar" },
     {SSPM_MIXED_MINOR_TYPE,"mixed" },
@@ -232,25 +229,25 @@ char* sspm_value(char* line)
     for(p=value; c != s; c++){
 	if(*c!=' ' && *c!='\n'){
 	    *(p++) = *c;
 	}
     }
 
     *p='\0';
 
     return value;
 
 }
 
-char *mime_headers[] = {
+static char *mime_headers[] = {
     "Content-Type",
     "Content-Transfer-Encoding",
     "Content-Disposition",
     "Content-Id",
     "Mime-Version",
     0 
 };
 
 
 void* sspm_default_new_part()
 {
     return 0;
@@ -357,49 +354,49 @@ int sspm_is_mime_terminating_boundary(char *line)
 enum line_type {
     EMPTY,
     BLANK,
     MIME_HEADER,
     MAIL_HEADER,
     HEADER_CONTINUATION,
     BOUNDARY,
     TERMINATING_BOUNDARY,
     UNKNOWN_TYPE
 };
 
 
-enum line_type get_line_type(char* line){
+static enum line_type get_line_type(char* line){
 
     if (line == 0){
 	return EMPTY;
     } else if(sspm_is_blank(line)){
 	return BLANK;
     } else if (sspm_is_mime_header(line)){
 	return MIME_HEADER;
     } else if (sspm_is_mail_header(line)){
 	return MAIL_HEADER;
     } else if (sspm_is_continuation_line(line)){
 	return HEADER_CONTINUATION;
     } else if (sspm_is_mime_terminating_boundary(line)){
 	return TERMINATING_BOUNDARY;
     } else if (sspm_is_mime_boundary(line)) {
 	return BOUNDARY;
     } else {
 	return UNKNOWN_TYPE;
     }
 
 
 }
 
 
-struct sspm_action_map get_action(struct mime_impl *impl,
+static struct sspm_action_map get_action(struct mime_impl *impl,
 				  enum sspm_major_type major,
 				  enum sspm_minor_type minor)
 {
     int i;
 
     /* Read caller suppled action map */
 
     if (impl->actions != 0){
 	for(i=0; impl->actions[i].major != SSPM_UNKNOWN_MAJOR_TYPE; i++){
 	    if((major == impl->actions[i].major &&
 	       minor == impl->actions[i].minor) ||
 	       (major == impl->actions[i].major &&