about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--crc32.335
-rw-r--r--[l---------]crc32_combine.345
3 files changed, 48 insertions, 34 deletions
diff --git a/Makefile b/Makefile
index d1a7ea7..911f96e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ MAN += adler32.3
 MAN += adler32_combine.3
 MAN += compress.3
 MAN += crc32.3
+MAN += crc32_combine.3
 MAN += deflate.3
 MAN += deflateBound.3
 MAN += deflateCopy.3
@@ -19,7 +20,6 @@ MAN += zlibVersion.3
 MLINKS += adler32.3 adler32_z.3
 MLINKS += compress.3 compress2.3
 MLINKS += compress.3 compressBound.3
-MLINKS += crc32.3 crc32_combine.3
 MLINKS += crc32.3 crc32_z.3
 MLINKS += deflate.3 deflateEnd.3
 MLINKS += deflate.3 deflateInit.3
diff --git a/crc32.3 b/crc32.3
index 6fb9fae..23d38d0 100644
--- a/crc32.3
+++ b/crc32.3
@@ -4,8 +4,7 @@
 .
 .Sh NAME
 .Nm crc32 ,
-.Nm crc32_z ,
-.Nm crc32_combine
+.Nm crc32_z
 .Nd update CRC-32 checksum
 .
 .Sh LIBRARY
@@ -17,8 +16,6 @@
 .Fn crc32 "uLong crc" "const Bytef *buf" "uInt len"
 .Ft uLong
 .Fn crc32_z "uLong crc" "const Bytef *buf" "z_size_t len"
-.Ft uLong
-.Fn crc32_combine "uLong crc1" "uLong crc2" "z_off_t len2"
 .
 .Sh DESCRIPTION
 Update a running CRC-32 with the bytes
@@ -44,33 +41,6 @@ but with a
 .Vt size_t
 length.
 .
-.Pp
-.Fn crc32_combine
-combines two CRC-32 check values into one.
-For two sequences of bytes,
-.Va seq1
-and
-.Va seq2
-with lengths
-.Va len1
-and
-.Va len2 ,
-CRC-32 check values were calculated for each,
-.Va crc1
-and
-.Va crc2 .
-.Fn crc32_combine
-returns the CRC-32 check value of
-.Va seq1
-and
-.Va seq2
-concatenated,
-requiring only
-.Fa crc1 ,
-.Fa crc2 ,
-and
-.Fa len2 .
-.
 .Sh EXAMPLES
 .Bd -literal -offset indent
 uLong crc = crc32(0L, Z_NULL, 0);
@@ -82,4 +52,5 @@ if (crc != original_crc) error();
 .Ed
 .
 .Sh SEE ALSO
-.Xr adler32 3
+.Xr adler32 3 ,
+.Xr crc32_combine 3
diff --git a/crc32_combine.3 b/crc32_combine.3
index cd5bed9..0424159 120000..100644
--- a/crc32_combine.3
+++ b/crc32_combine.3
@@ -1 +1,44 @@
-crc32.3
\ No newline at end of file
+.Dd November 8, 2018
+.Dt CRC32_COMBINE 3
+.Os
+.
+.Sh NAME
+.Nm crc32_combine
+.Nd combine CRC-32 checksums
+.
+.Sh LIBRARY
+.Lb libz
+.
+.Sh SYNOPSIS
+.In zlib.h
+.Ft uLong
+.Fn crc32_combine "uLong crc1" "uLong crc2" "z_off_t len2"
+.
+.Sh DESCRIPTION
+Combine two CRC-32 check values into one.
+For two sequences of bytes,
+.Va seq1
+and
+.Va seq2
+with lengths
+.Va len1
+and
+.Va len2 ,
+CRC-32 check values were calculated for each,
+.Va crc1
+and
+.Va crc2 .
+.Fn crc32_combine
+returns the CRC-32 check value of
+.Va seq1
+and
+.Va seq2
+concatenated,
+requiring only
+.Fa crc1 ,
+.Fa crc2 ,
+and
+.Fa len2 .
+.
+.Sh SEE ALSO
+.Xr crc32 3