Merge pull request #52 from sugarcrm/OPS-22368/dpates/fix-warnings

[OPS-22368] Fix warnings in shadow.

Author: demonfoo

php_shadow.h

@@ -69,7 +69,7 @@ ZEND_END_MODULE_GLOBALS(shadow)
 #define SHADOW_G(v) (shadow_globals.v)
 #endif
 
-#define SHADOW_VERSION "1.1.0"
+#define SHADOW_VERSION "1.1.1"
 
 ZEND_EXTERN_MODULE_GLOBALS(shadow)
 

shadow.c

@@ -45,7 +45,7 @@ php_stream_wrapper shadow_wrapper = {
 	0
 };
 
-static size_t shadow_dirstream_read(php_stream *stream, char *buf, size_t count);
+static ssize_t shadow_dirstream_read(php_stream *stream, char *buf, size_t count);
 static int shadow_dirstream_close(php_stream *stream, int close_handle);
 static int shadow_dirstream_rewind(php_stream *stream, off_t offset, int whence, off_t *newoffs);
 
@@ -873,7 +873,7 @@ zend_string *shadow_resolve_path(zend_string *filename)
         result = original_zend_resolve_path(filename);
     }
     if (SHADOW_G(debug) & SHADOW_DEBUG_RESOLVE) {
-		fprintf(stderr, "Resolve: %s -> %s\n", filename, result ? ZSTR_VAL(result) : NULL);
+		fprintf(stderr, "Resolve: %s -> %s\n", filename ? ZSTR_VAL(filename) : NULL, result ? ZSTR_VAL(result) : NULL);
     }
     return result;
 }
@@ -1126,7 +1126,7 @@ static php_stream *shadow_dir_opener(php_stream_wrapper *wrapper, const char *pa
 	return mergestream;
 }
 
-static size_t shadow_dirstream_read(php_stream *stream, char *buf, size_t count)
+static ssize_t shadow_dirstream_read(php_stream *stream, char *buf, size_t count)
 {
 	php_stream_dirent *ent = (php_stream_dirent*)buf;
 	HashTable *mergedata = (HashTable *)stream->abstract;