libical-1.0HEADlibical-1.0master

1 files changed, 9 insertions, 8 deletions

diff --git a/src/libical/icallangbind.c b/src/libical/icallangbind.c
index 904be27..8218872 100644
--- a/src/libical/icallangbind.c
+++ b/src/libical/icallangbind.c
@@ -30,9 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#define strcasecmp stricmp
 #endif
 
 int* icallangbind_new_array(int size){
@@ -160,8 +160,8 @@ char* icallangbind_property_eval_string_r(icalproperty* prop, char* sep)
 {
     char tmp[25];
     size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;
+    char* buf; 
+    char* buf_ptr; 
     icalparameter *param;
     
     icalvalue* value;
@@ -169,6 +169,9 @@ char* icallangbind_property_eval_string_r(icalproperty* prop, char* sep)
     if( prop == 0){
 	return 0;
     }
+  
+    buf = icalmemory_new_buffer(buf_size);
+    buf_ptr = buf;
 
     APPENDS("{ ");
 
@@ -314,9 +317,7 @@ char* icallangbind_quote_as_ical_r(const char* str)
 
     /* assume every char could be quoted */
     char* buf = icalmemory_new_buffer(buf_size);
-    int result;
-
-    result = icalvalue_encode_ical_string(str, buf, buf_size);
+    (void)icalvalue_encode_ical_string(str, buf, (int)buf_size);
 
     return buf;
 }