Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Cyan4973 committed Mar 5, 2020
2 parents 98459bb + ff5df55 commit d408e9b
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# You can contact the author at:
# - xxHash homepage: http://www.xxhash.com
# - xxHash homepage: https://www.xxhash.com
# - xxHash source repository: https://github.com/Cyan4973/xxHash
# ################################################################
# xxhsum: provides 32/64 bits hash of one or multiple files, or stdin
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The reference system uses a Core 2 Duo @3GHz
| MD5-32 | 0.33 GB/s | 10 | Ronald L.Rivest |
| SHA1-32 | 0.28 GB/s | 10 | |

[xxHash]: http://www.xxhash.com
[xxHash]: https://www.xxhash.com

Note †: SMHasher's CRC32 implementation is known to be slow. Faster implementations exist.

Expand Down Expand Up @@ -192,7 +192,7 @@ XXH64_hash_t calcul_hash_streaming(FileHandler fh)
Aside from the C reference version,
xxHash is also available in many different programming languages,
thanks to many great contributors.
They are [listed here](http://www.xxhash.com/#other-languages).
They are [listed here](https://www.xxhash.com/#other-languages).
### Branch Policy
Expand Down
2 changes: 1 addition & 1 deletion doc/xxhash_spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ On 32-bit systems though, positions are reversed: `XXH64` performance is reduced
Reference Implementation
----------------------------------------

A reference library written in C is available at http://www.xxhash.com.
A reference library written in C is available at https://www.xxhash.com.
The web page also links to multiple other implementations written in many different languages.
It links to the [github project page](https://github.com/Cyan4973/xxHash) where an [issue board](https://github.com/Cyan4973/xxHash/issues) can be used for further public discussions on the topic.

Expand Down
4 changes: 2 additions & 2 deletions libxxhash.pc.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# xxHash - Extremely fast hash algorithm
# BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
# BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)

prefix=@PREFIX@
exec_prefix=${prefix}
Expand All @@ -8,7 +8,7 @@ libdir=${exec_prefix}/lib

Name: xxhash
Description: extremely fast hash algorithm
URL: http://www.xxhash.com/
URL: https://www.xxhash.com/
Version: @VERSION@
Libs: -L${libdir} -lxxhash
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion tests/bench/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# You can contact the author at:
# - xxHash homepage: http://www.xxhash.com
# - xxHash homepage: https://www.xxhash.com
# - xxHash source repository: https://github.com/Cyan4973/xxHash
# ################################################################
# benchHash: A generic benchmark for hash algorithms
Expand Down
2 changes: 1 addition & 1 deletion tests/bench/benchHash.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/bench/benchHash.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/bench/bhDisplay.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at :
* - xxHash homepage : http://www.xxhash.com
* - xxHash homepage : https://www.xxhash.com
* - xxHash source repository : https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/bench/bhDisplay.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/bench/hashes.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/bench/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/collisions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# You can contact the author at :
# - xxHash homepage: http://www.xxhash.com
# - xxHash homepage: https://www.xxhash.com
# - xxHash source repository : https://github.com/Cyan4973/xxHash
#

Expand Down
2 changes: 1 addition & 1 deletion tests/collisions/allcodecs/dummy.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/collisions/allcodecs/dummy.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/collisions/hashes.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/collisions/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/collisions/sort.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/collisions/sort.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at :
* - xxHash homepage : http://www.xxhash.com
* - xxHash homepage : https://www.xxhash.com
* - xxHash source repository : https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/multiInclude.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion xxh3.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion xxhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion xxhash.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down
2 changes: 1 addition & 1 deletion xxhsum.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* You can contact the author at:
* - xxHash homepage: http://www.xxhash.com
* - xxHash homepage: https://www.xxhash.com
* - xxHash source repository: https://github.com/Cyan4973/xxHash
*/

Expand Down

0 comments on commit d408e9b

Please sign in to comment.