stupid windows doesn't allow varargs macros, so remove it. remove unused variable

diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index f80f39ad0afa48906dbb4b82d9021e0ba59f0b3f..1935da0085f6f7651213ec627d00b076fcbb4cfd 100644 (file)
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -377,7 +377,6 @@ PHPAPI void phar_fancy_stat(struct stat *stat_sb, int type, zval *return_value T
 {
        zval *stat_dev, *stat_ino, *stat_mode, *stat_nlink, *stat_uid, *stat_gid, *stat_rdev,
                 *stat_size, *stat_atime, *stat_mtime, *stat_ctime, *stat_blksize, *stat_blocks;
-       php_stream_statbuf ssb;
        int rmask=S_IROTH, wmask=S_IWOTH, xmask=S_IXOTH; /* access rights defaults to other */
        char *stat_sb_names[13] = {
                "dev", "ino", "mode", "nlink", "uid", "gid", "rdev",

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 50da4ebdee758393d7ccd829357cfae25f842e70..fa0e6f3a54743a8461bcac998baca5308f0e88a7 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -526,38 +526,49 @@ PHP_METHOD(Phar, webPhar)
 
        /* set up mime types */
        zend_hash_init(&mimetypes, sizeof(phar_mime_type *), zend_get_hash_value, NULL, 0);
-#define PHAR_SET_MIME(mimetype, ret, ...) \
+#define PHAR_SET_MIME(mimetype, ret, fileext) \
                mime.mime = mimetype; \
                mime.len = sizeof((mimetype))+1; \
                mime.type = ret; \
-               { \
-                       char mimes[][5] = {__VA_ARGS__, "\0"}; \
-                       int i = 0; \
-                       for (; mimes[i][0]; i++) { \
-                               zend_hash_add(&mimetypes, mimes[i], strlen(mimes[i]), (void *)&mime, sizeof(phar_mime_type), NULL); \
-                       } \
-               }
+               zend_hash_add(&mimetypes, fileext, sizeof(fileext)-1, (void *)&mime, sizeof(phar_mime_type), NULL); \
 
        PHAR_SET_MIME("text/html", PHAR_MIME_PHPS, "phps")
-       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "c", "cc", "cpp", "c++", "dtd", "h", "log", "rng", "txt", "xsd")
-       PHAR_SET_MIME("", PHAR_MIME_PHP, "php", "inc")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "c")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "cc")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "cpp")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "c++")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "dtd")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "h")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "log")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "rng")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "txt")
+       PHAR_SET_MIME("text/plain", PHAR_MIME_OTHER, "xsd")
+       PHAR_SET_MIME("", PHAR_MIME_PHP, "php")
+       PHAR_SET_MIME("", PHAR_MIME_PHP, "inc")
        PHAR_SET_MIME("video/avi", PHAR_MIME_OTHER, "avi")
        PHAR_SET_MIME("image/bmp", PHAR_MIME_OTHER, "bmp")
        PHAR_SET_MIME("text/css", PHAR_MIME_OTHER, "css")
        PHAR_SET_MIME("image/gif", PHAR_MIME_OTHER, "gif")
-       PHAR_SET_MIME("text/html", PHAR_MIME_OTHER, "htm", "html", "htmls")
+       PHAR_SET_MIME("text/html", PHAR_MIME_OTHER, "htm")
+       PHAR_SET_MIME("text/html", PHAR_MIME_OTHER, "html")
+       PHAR_SET_MIME("text/html", PHAR_MIME_OTHER, "htmls")
        PHAR_SET_MIME("image/x-ico", PHAR_MIME_OTHER, "ico")
-       PHAR_SET_MIME("image/jpeg", PHAR_MIME_OTHER, "jpe", "jpg", "jpeg")
+       PHAR_SET_MIME("image/jpeg", PHAR_MIME_OTHER, "jpe")
+       PHAR_SET_MIME("image/jpeg", PHAR_MIME_OTHER, "jpg")
+       PHAR_SET_MIME("image/jpeg", PHAR_MIME_OTHER, "jpeg")
        PHAR_SET_MIME("application/x-javascript", PHAR_MIME_OTHER, "js")
-       PHAR_SET_MIME("audio/midi", PHAR_MIME_OTHER, "mid", "midi")
+       PHAR_SET_MIME("audio/midi", PHAR_MIME_OTHER, "midi")
+       PHAR_SET_MIME("audio/midi", PHAR_MIME_OTHER, "midi")
        PHAR_SET_MIME("audio/mod", PHAR_MIME_OTHER, "mod")
        PHAR_SET_MIME("movie/quicktime", PHAR_MIME_OTHER, "mov")
        PHAR_SET_MIME("audio/mp3", PHAR_MIME_OTHER, "mp3")
-       PHAR_SET_MIME("video/mpeg", PHAR_MIME_OTHER, "mpg", "mpeg")
+       PHAR_SET_MIME("video/mpeg", PHAR_MIME_OTHER, "mpg")
+       PHAR_SET_MIME("video/mpeg", PHAR_MIME_OTHER, "mpeg")
        PHAR_SET_MIME("application/pdf", PHAR_MIME_OTHER, "pdf")
        PHAR_SET_MIME("image/png", PHAR_MIME_OTHER, "png")
        PHAR_SET_MIME("application/shockwave-flash", PHAR_MIME_OTHER, "swf")
-       PHAR_SET_MIME("image/tiff", PHAR_MIME_OTHER, "tif", "tiff")
+       PHAR_SET_MIME("image/tiff", PHAR_MIME_OTHER, "tif")
+       PHAR_SET_MIME("image/tiff", PHAR_MIME_OTHER, "tiff")
        PHAR_SET_MIME("audio/wav", PHAR_MIME_OTHER, "wav")
        PHAR_SET_MIME("image/xbm", PHAR_MIME_OTHER, "xbm")
        PHAR_SET_MIME("text/xml", PHAR_MIME_OTHER, "xml")