rugged 0.21.1b2 → 0.21.2

data/ext/rugged/rugged_tag_collection.c

@@ -177,73 +177,6 @@ static VALUE rb_git_tag_collection_create(int argc, VALUE *argv, VALUE self)
 	return rb_git_tag_collection_aref(self, rb_name);
 }
 
-/*
- *  call-seq:
- *    tags.create_annotation(name, target, annotation) -> annotation
- *
- *  Create a new annotated tag object with the specified +name+ on +target+ in
- *  +repo+.
- *
- *  Unlike the +create+ method, +create_annotation+ simply creates a tag
- *  object. It does not write a tag ref.
- *
- *  +annotation+ must have the following keys:
- *
- *  :tagger ::
- *    An optional Hash containing a git signature. Defaults to the signature
- *    from the configuration if only `:message` is given. Will cause the
- *    creation of an annotated tag object if present.
- *
- *  :message ::
- *    An optional string containing the message for the new tag.
- *
- *  Returns an instance of Rugged::Tag::Annotation representing the newly
- *  created annotation.
- */
-static VALUE rb_git_tag_collection_create_annotation(VALUE self, VALUE rb_name, VALUE rb_target, VALUE rb_annotation)
-{
-	git_oid tag_oid;
-	git_repository *repo = NULL;
-	git_object *target = NULL, *tag = NULL;
-	git_signature *tagger = NULL;
-	VALUE rb_message;
-	int error;
-
-	VALUE rb_repo = rugged_owner(self);
-	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
-
-	Check_Type(rb_name, T_STRING);
-
-	target = rugged_object_get(repo, rb_target, GIT_OBJ_ANY);
-
-	rb_message = rb_hash_aref(rb_annotation, CSTR2SYM("message"));
-	Check_Type(rb_message, T_STRING);
-
-	tagger = rugged_signature_get(
-		rb_hash_aref(rb_annotation, CSTR2SYM("tagger")), repo
-	);
-
-	error = git_tag_annotation_create(
-		&tag_oid,
-		repo,
-		StringValueCStr(rb_name),
-		target,
-		tagger,
-		StringValueCStr(rb_message)
-	);
-
-	git_object_free(target);
-	git_signature_free(tagger);
-
-	rugged_exception_check(error);
-
-	error = git_object_lookup(&tag, repo, &tag_oid, GIT_OBJ_TAG);
-	rugged_exception_check(error);
-
-	return rugged_object_new(rb_repo, tag);
-}
-
 static VALUE each_tag(int argc, VALUE *argv, VALUE self, int tag_names_only)
 {
 	git_repository *repo;
@@ -336,9 +269,8 @@ void Init_rugged_tag_collection(void)
 
 	rb_define_method(rb_cRuggedTagCollection, "initialize", rb_git_tag_collection_initialize, 1);
 
-	rb_define_method(rb_cRuggedTagCollection, "create",            rb_git_tag_collection_create, -1);
-	rb_define_method(rb_cRuggedTagCollection, "create_annotation", rb_git_tag_collection_create_annotation, 3);
-	rb_define_method(rb_cRuggedTagCollection, "[]",                rb_git_tag_collection_aref, 1);
+	rb_define_method(rb_cRuggedTagCollection, "create",     rb_git_tag_collection_create, -1);
+	rb_define_method(rb_cRuggedTagCollection, "[]",         rb_git_tag_collection_aref, 1);
 
 	rb_define_method(rb_cRuggedTagCollection, "each",       rb_git_tag_collection_each, -1);
 	rb_define_method(rb_cRuggedTagCollection, "each_name",  rb_git_tag_collection_each_name, -1);

data/ext/rugged/rugged_tree.c

@@ -188,26 +188,14 @@ static VALUE rb_git_tree_each(VALUE self)
 	return Qnil;
 }
 
-static int rugged__treewalk_cb(const char *root, const git_tree_entry *entry, void *payload)
+static int rugged__treewalk_cb(const char *root, const git_tree_entry *entry, void *proc)
 {
-	int *exception = (int *)payload;
+	rb_funcall((VALUE)proc, rb_intern("call"), 2,
+		rb_str_new_utf8(root),
+		rb_git_treeentry_fromC(entry)
+	);
 
-	VALUE rb_result, rb_args = rb_ary_new2(2);
-
-	rb_ary_push(rb_args, rb_str_new_utf8(root));
-	rb_ary_push(rb_args, rb_git_treeentry_fromC(entry));
-
-	rb_result = rb_protect(rb_yield_splat, rb_args, exception);
-
-	if (*exception)
-		return -1;
-
-	/* skip entry when 'false' is returned */
-	if (TYPE(rb_result) == T_FALSE)
-		return 1;
-
-	/* otherwise continue normal iteration */
-	return 0;
+	return GIT_OK;
 }
 
 /*
@@ -220,9 +208,6 @@ static int rugged__treewalk_cb(const char *root, const git_tree_entry *entry, vo
  *  also takes a +root+, the relative path in the traversal, starting from the root
  *  of the original tree.
  *
- *  If the +block+ returns a falsy value, that entry and its sub-entries (in the case
- *  of a folder) will be skipped for the iteration.
- *
  *  If no +block+ is given, an +Iterator+ is returned instead.
  *
  *    tree.walk(:postorder) { |root, entry| puts "#{root}#{entry[:name]} [#{entry[:oid]}]" }
@@ -238,7 +223,7 @@ static int rugged__treewalk_cb(const char *root, const git_tree_entry *entry, vo
 static VALUE rb_git_tree_walk(VALUE self, VALUE rb_mode)
 {
 	git_tree *tree;
-	int error, mode = 0, exception = 0;
+	int error, mode = 0;
 	ID id_mode;
 
 	Data_Get_Struct(self, git_tree, tree);
@@ -257,11 +242,7 @@ static VALUE rb_git_tree_walk(VALUE self, VALUE rb_mode)
 		rb_raise(rb_eTypeError,
 				"Invalid iteration mode. Expected `:preorder` or `:postorder`");
 
-	error = git_tree_walk(tree, mode, &rugged__treewalk_cb, (void *)&exception);
-
-	if (exception)
-		rb_jump_tag(exception);
-
+	error = git_tree_walk(tree, mode, &rugged__treewalk_cb, (void *)rb_block_proc());
 	rugged_exception_check(error);
 
 	return Qnil;
@@ -473,7 +454,7 @@ static VALUE rb_git_tree_diff_(int argc, VALUE *argv, VALUE self)
 	xfree(opts.pathspec.strings);
 	rugged_exception_check(error);
 
-	return rugged_diff_new(rb_cRuggedDiff, rb_repo, diff);
+	return rugged_diff_new(rb_cRuggedDiff, self, diff);
 }
 
 /*
@@ -508,7 +489,7 @@ static VALUE rb_git_tree_diff_workdir(int argc, VALUE *argv, VALUE self)
 	xfree(opts.pathspec.strings);
 	rugged_exception_check(error);
 
-	return rugged_diff_new(rb_cRuggedDiff, owner, diff);
+	return rugged_diff_new(rb_cRuggedDiff, self, diff);
 }
 
 void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)

data/lib/rugged.rb

@@ -18,5 +18,3 @@ require 'rugged/diff'
 require 'rugged/patch'
 require 'rugged/remote'
 require 'rugged/credentials'
-require 'rugged/attributes'
-require 'rugged/blob'

data/lib/rugged/diff.rb

@@ -8,6 +8,7 @@ module Rugged
     alias each each_patch
 
     attr_reader :owner
+    alias tree owner
 
     def patches
       each_patch.to_a

data/lib/rugged/diff/line.rb

@@ -1,7 +1,9 @@
 module Rugged
   class Diff
     class Line
-      attr_reader :line_origin, :content, :old_lineno, :new_lineno, :content_offset
+      attr_reader :line_origin, :content, :owner, :old_lineno, :new_lineno, :content_offset
+
+      alias hunk owner
 
       def context?
         @line_origin == :context

data/lib/rugged/patch.rb

@@ -13,19 +13,9 @@ module Rugged
       "#<#{self.class.name}:#{object_id}>"
     end
 
-    # Returns the number of additions in the patch.
-    def additions
-      stat[0]
-    end
-
-    # Returns the number of deletions in the patch.
-    def deletions
-      stat[1]
-    end
-
-    # Returns the number of total changes in the patch.
+    # Returns the number of changes in the patch.
     def changes
-      additions + deletions
+      stat.reduce { |t,v| t + v }
     end
 
     # Returns an Array containing all hunks of the patch.

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.21.1b2'
+  Version = VERSION = '0.21.2'
 end

data/vendor/libgit2/CMakeLists.txt

@@ -36,7 +36,6 @@ OPTION( ANDROID				"Build for android NDK"	 				OFF )
 
 OPTION( USE_ICONV			"Link with and use iconv library" 		OFF )
 OPTION( USE_SSH				"Link with libssh to enable SSH support" ON )
-OPTION( USE_GSSAPI			"Link with libgssapi for SPNEGO auth"   OFF )
 OPTION( VALGRIND			"Configure build for valgrind"			OFF )
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -209,14 +208,6 @@ IF (LIBSSH2_FOUND)
 	SET(SSH_LIBRARIES ${LIBSSH2_LIBRARIES})
 ENDIF()
 
-# Optional external dependency: libgssapi
-IF (USE_GSSAPI)
-	FIND_PACKAGE(GSSAPI)
-ENDIF()
-IF (GSSAPI_FOUND)
-	ADD_DEFINITIONS(-DGIT_GSSAPI)
-ENDIF()
-
 # Optional external dependency: iconv
 IF (USE_ICONV)
 	FIND_PACKAGE(Iconv)
@@ -396,7 +387,6 @@ ENDIF()
 ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SHA1} ${WIN_RC})
 TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES})
 TARGET_LINK_LIBRARIES(git2 ${SSH_LIBRARIES})
-TARGET_LINK_LIBRARIES(git2 ${GSSAPI_LIBRARIES})
 TARGET_LINK_LIBRARIES(git2 ${ICONV_LIBRARIES})
 TARGET_OS_LIBRARIES(git2)
 
@@ -463,7 +453,6 @@ IF (BUILD_CLAR)
 
 	TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES})
 	TARGET_LINK_LIBRARIES(libgit2_clar ${SSH_LIBRARIES})
-	TARGET_LINK_LIBRARIES(libgit2_clar ${GSSAPI_LIBRARIES})
 	TARGET_LINK_LIBRARIES(libgit2_clar ${ICONV_LIBRARIES})
 	TARGET_OS_LIBRARIES(libgit2_clar)
 	MSVC_SPLIT_SOURCES(libgit2_clar)

data/vendor/libgit2/deps/http-parser/http_parser.h

@@ -40,8 +40,6 @@ typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 typedef SIZE_T size_t;
 typedef SSIZE_T ssize_t;
-#elif defined(__sun) || defined(__sun__)
-#include <sys/inttypes.h>
 #else
 #include <stdint.h>
 #endif

data/vendor/libgit2/deps/zlib/adler32.c

@@ -1,5 +1,5 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2007 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,9 +9,9 @@
 
 #define local static
 
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
 
-#define BASE 65521      /* largest prime smaller than 65536 */
+#define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -21,44 +21,39 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
-/* use NO_DIVIDE if your processor does not do division in hardware --
-   try it both ways to see which is faster */
+/* use NO_DIVIDE if your processor does not do division in hardware */
 #ifdef NO_DIVIDE
-/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
-   (thank you to John Reiser for pointing this out) */
-#  define CHOP(a) \
-    do { \
-        unsigned long tmp = a >> 16; \
-        a &= 0xffffUL; \
-        a += (tmp << 4) - tmp; \
-    } while (0)
-#  define MOD28(a) \
+#  define MOD(a) \
     do { \
-        CHOP(a); \
+        if (a >= (BASE << 16)) a -= (BASE << 16); \
+        if (a >= (BASE << 15)) a -= (BASE << 15); \
+        if (a >= (BASE << 14)) a -= (BASE << 14); \
+        if (a >= (BASE << 13)) a -= (BASE << 13); \
+        if (a >= (BASE << 12)) a -= (BASE << 12); \
+        if (a >= (BASE << 11)) a -= (BASE << 11); \
+        if (a >= (BASE << 10)) a -= (BASE << 10); \
+        if (a >= (BASE << 9)) a -= (BASE << 9); \
+        if (a >= (BASE << 8)) a -= (BASE << 8); \
+        if (a >= (BASE << 7)) a -= (BASE << 7); \
+        if (a >= (BASE << 6)) a -= (BASE << 6); \
+        if (a >= (BASE << 5)) a -= (BASE << 5); \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
         if (a >= BASE) a -= BASE; \
     } while (0)
-#  define MOD(a) \
+#  define MOD4(a) \
     do { \
-        CHOP(a); \
-        MOD28(a); \
-    } while (0)
-#  define MOD63(a) \
-    do { /* this assumes a is not negative */ \
-        z_off64_t tmp = a >> 32; \
-        a &= 0xffffffffL; \
-        a += (tmp << 8) - (tmp << 5) + tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
         if (a >= BASE) a -= BASE; \
     } while (0)
 #else
 #  define MOD(a) a %= BASE
-#  define MOD28(a) a %= BASE
-#  define MOD63(a) a %= BASE
+#  define MOD4(a) a %= BASE
 #endif
 
 /* ========================================================================= */
@@ -97,7 +92,7 @@ uLong ZEXPORT adler32(adler, buf, len)
         }
         if (adler >= BASE)
             adler -= BASE;
-        MOD28(sum2);            /* only added so many BASE's */
+        MOD4(sum2);             /* only added so many BASE's */
         return adler | (sum2 << 16);
     }
 
@@ -142,13 +137,8 @@ local uLong adler32_combine_(adler1, adler2, len2)
     unsigned long sum2;
     unsigned rem;
 
-    /* for negative len, return invalid adler32 as a clue for debugging */
-    if (len2 < 0)
-        return 0xffffffffUL;
-
     /* the derivation of this formula is left as an exercise for the reader */
-    MOD63(len2);                /* assumes len2 >= 0 */
-    rem = (unsigned)len2;
+    rem = (unsigned)(len2 % BASE);
     sum1 = adler1 & 0xffff;
     sum2 = rem * sum1;
     MOD(sum2);

data/vendor/libgit2/deps/zlib/crc32.c

@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 1995-2006, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -17,8 +17,6 @@
   of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
-
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
  */
 
 #ifdef MAKECRCH
@@ -32,11 +30,31 @@
 
 #define local static
 
+/* Find a four-byte integer type for crc32_little() and crc32_big(). */
+#ifndef NOBYFOUR
+#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
+#    include <limits.h>
+#    define BYFOUR
+#    if (UINT_MAX == 0xffffffffUL)
+       typedef unsigned int u4;
+#    else
+#      if (ULONG_MAX == 0xffffffffUL)
+         typedef unsigned long u4;
+#      else
+#        if (USHRT_MAX == 0xffffffffUL)
+           typedef unsigned short u4;
+#        else
+#          undef BYFOUR     /* can't find a four-byte integer type! */
+#        endif
+#      endif
+#    endif
+#  endif /* STDC */
+#endif /* !NOBYFOUR */
+
 /* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
-#endif
 #ifdef BYFOUR
+#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
+                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, unsigned));
    local unsigned long crc32_big OF((unsigned long,
@@ -50,16 +68,16 @@
 local unsigned long gf2_matrix_times OF((unsigned long *mat,
                                          unsigned long vec));
 local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);
 
 
 #ifdef DYNAMIC_CRC_TABLE
 
 local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
+local unsigned long FAR crc_table[TBLS][256];
 local void make_crc_table OF((void));
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
+   local void write_table OF((FILE *, const unsigned long FAR *));
 #endif /* MAKECRCH */
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
@@ -89,9 +107,9 @@ local void make_crc_table OF((void));
 */
 local void make_crc_table()
 {
-    z_crc_t c;
+    unsigned long c;
     int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
+    unsigned long poly;                 /* polynomial exclusive-or pattern */
     /* terms of polynomial defining this crc (except x^32): */
     static volatile int first = 1;      /* flag to limit concurrent making */
     static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
@@ -103,13 +121,13 @@ local void make_crc_table()
         first = 0;
 
         /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
+        poly = 0UL;
+        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
+            poly |= 1UL << (31 - p[n]);
 
         /* generate a crc for every 8-bit value */
         for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
+            c = (unsigned long)n;
             for (k = 0; k < 8; k++)
                 c = c & 1 ? poly ^ (c >> 1) : c >> 1;
             crc_table[0][n] = c;
@@ -120,11 +138,11 @@ local void make_crc_table()
            and then the byte reversal of those as well as the first table */
         for (n = 0; n < 256; n++) {
             c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
+            crc_table[4][n] = REV(c);
             for (k = 1; k < 4; k++) {
                 c = crc_table[0][c & 0xff] ^ (c >> 8);
                 crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
+                crc_table[k + 4][n] = REV(c);
             }
         }
 #endif /* BYFOUR */
@@ -146,7 +164,7 @@ local void make_crc_table()
         if (out == NULL) return;
         fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
         fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
+        fprintf(out, "local const unsigned long FAR ");
         fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
         write_table(out, crc_table[0]);
 #  ifdef BYFOUR
@@ -166,13 +184,12 @@ local void make_crc_table()
 #ifdef MAKECRCH
 local void write_table(out, table)
     FILE *out;
-    const z_crc_t FAR *table;
+    const unsigned long FAR *table;
 {
     int n;
 
     for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
-                (unsigned long)(table[n]),
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
                 n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
 }
 #endif /* MAKECRCH */
@@ -187,13 +204,13 @@ local void write_table(out, table)
 /* =========================================================================
  * This function can be used by asm versions of crc32()
  */
-const z_crc_t FAR * ZEXPORT get_crc_table()
+const unsigned long FAR * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
     if (crc_table_empty)
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const z_crc_t FAR *)crc_table;
+    return (const unsigned long FAR *)crc_table;
 }
 
 /* ========================================================================= */
@@ -215,7 +232,7 @@ unsigned long ZEXPORT crc32(crc, buf, len)
 
 #ifdef BYFOUR
     if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
+        u4 endian;
 
         endian = 1;
         if (*((unsigned char *)(&endian)))
@@ -249,17 +266,17 @@ local unsigned long crc32_little(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
+    register u4 c;
+    register const u4 FAR *buf4;
 
-    c = (z_crc_t)crc;
+    c = (u4)crc;
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
         len--;
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
     while (len >= 32) {
         DOLIT32;
         len -= 32;
@@ -289,17 +306,17 @@ local unsigned long crc32_big(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
+    register u4 c;
+    register const u4 FAR *buf4;
 
-    c = ZSWAP32((z_crc_t)crc);
+    c = REV((u4)crc);
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
         len--;
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
     buf4--;
     while (len >= 32) {
         DOBIG32;
@@ -316,7 +333,7 @@ local unsigned long crc32_big(crc, buf, len)
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)(ZSWAP32(c));
+    return (unsigned long)(REV(c));
 }
 
 #endif /* BYFOUR */