From 482654692b90e96110356ee23a3a612a62fb4414 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 11 Nov 2018 15:35:56 -0500 Subject: Separate out adler32_combine.3 --- Makefile | 2 +- adler32.3 | 42 ++---------------------------------------- adler32_combine.3 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 42 deletions(-) mode change 120000 => 100644 adler32_combine.3 diff --git a/Makefile b/Makefile index 459ed75..d1a7ea7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ MAN += adler32.3 +MAN += adler32_combine.3 MAN += compress.3 MAN += crc32.3 MAN += deflate.3 @@ -15,7 +16,6 @@ MAN += uncompress.3 MAN += zlibCompileFlags.3 MAN += zlibVersion.3 -MLINKS += adler32.3 adler32_combine.3 MLINKS += adler32.3 adler32_z.3 MLINKS += compress.3 compress2.3 MLINKS += compress.3 compressBound.3 diff --git a/adler32.3 b/adler32.3 index 061edce..162f4b1 100644 --- a/adler32.3 +++ b/adler32.3 @@ -4,8 +4,7 @@ . .Sh NAME .Nm adler32 , -.Nm adler32_z , -.Nm adler32_combine +.Nm adler32_z .Nd update Adler-32 checksum . .Sh LIBRARY @@ -17,8 +16,6 @@ .Fn adler32 "uLong adler" "const Bytef *buf" "uInt len" .Ft uLong .Fn adler32_z "uLong adler" "const Bytef *buf" "z_size_t len" -.Ft uLong -.Fn adler32_combine "uLong adler1" "uLong adler2" "z_off_t len2" . .Sh DESCRIPTION Update a running Adler-32 checksum with the bytes @@ -43,42 +40,6 @@ but with a .Vt size_t length. . -.Pp -.Fn adler32_combine -combines two Adler-32 checksums into one. -For two sequences of bytes, -.Va seq1 -and -.Va seq2 -with lengths -.Va len1 -and -.Va len2 , -Adler-32 checksums were calculated for each, -.Va adler1 -and -.Va adler2 . -.Fn adler32_combine -returns the Adler-32 checksum of -.Va seq1 -and -.Va seq2 -concatenated, -requiring only -.Fa adler1 , -.Fa adler2 , -and -.Fa len2 . -Note that the -.Vt z_off_t -type -.Pq like Vt off_t -is a signed integer. -If -.Fa len2 -is negative, -the result has no meaning or utility. -. .Sh EXAMPLES .Bd -literal -offset indent uLong adler = adler32(0L, Z_NULL, 0); @@ -90,4 +51,5 @@ if (adler != original_adler) error(); .Ed . .Sh SEE ALSO +.Xr adler32_combine 3 , .Xr crc32 3 diff --git a/adler32_combine.3 b/adler32_combine.3 deleted file mode 120000 index 630dd96..0000000 --- a/adler32_combine.3 +++ /dev/null @@ -1 +0,0 @@ -adler32.3 \ No newline at end of file diff --git a/adler32_combine.3 b/adler32_combine.3 new file mode 100644 index 0000000..883ddb2 --- /dev/null +++ b/adler32_combine.3 @@ -0,0 +1,53 @@ +.Dd November 9, 2018 +.Dt ADLER32_COMBINE 3 +.Os +. +.Sh NAME +.Nm adler32_combine +.Nd combine Adler-32 checksums +. +.Sh LIBRARY +.Lb libz +. +.Sh SYNOPSIS +.In zlib.h +.Ft uLong +.Fn adler32_combine "uLong adler1" "uLong adler2" "z_off_t len2" +. +.Sh DESCRIPTION +Combine two Adler-32 checksums into one. +For two sequences of bytes, +.Va seq1 +and +.Va seq2 +with lengths +.Va len1 +and +.Va len2 , +Adler-32 checksums were calculated for each, +.Va adler1 +and +.Va adler2 . +.Fn adler32_combine +returns the Adler-32 checksum of +.Va seq1 +and +.Va seq2 +concatenated, +requiring only +.Fa adler1 , +.Fa adler2 , +and +.Fa len2 . +Note that the +.Vt z_off_t +type +.Pq like Vt off_t +is a signed integer. +If +.Fa len2 +is negative, +the result has no meaning or utility. +. +.Sh SEE ALSO +.Xr adler32 3 -- cgit 1.4.1