~ruther/guix-local

ea1673808584f3c40cc76cc2ea570676309ba5bc — Ludovic Courtès 12 years ago 8eaa8a3
daemon: Use 'int' instead of the internal 'gcry_md_algo_t' type.

Fixes compilation with the forthcoming libgcrypt 1.6.x.
Reported by Matthias Wachs <wachs@net.in.tum.de>
and NIIBE Yutaka <gniibe@fsij.org>.

* nix/libutil/gcrypt-hash.cc (guix_hash_init, guix_hash_final): Use
  'int' as the type of the 'algo' parameter.
* nix/libutil/gcrypt-hash.hh: Update declarations accordingly.
2 files changed, 6 insertions(+), 6 deletions(-)

M nix/libutil/gcrypt-hash.cc
M nix/libutil/gcrypt-hash.hh
M nix/libutil/gcrypt-hash.cc => nix/libutil/gcrypt-hash.cc +3 -3
@@ 1,5 1,5 @@
/* GNU Guix --- Functional package management for GNU
   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
   Copyright (C) 2012, 2013  Ludovic Courtès <ludo@gnu.org>

   This file is part of GNU Guix.



@@ 24,7 24,7 @@
extern "C" {

void
guix_hash_init (struct guix_hash_context *ctx, gcry_md_algo_t algo)
guix_hash_init (struct guix_hash_context *ctx, int algo)
{
  gcry_error_t err;



@@ 40,7 40,7 @@ guix_hash_update (struct guix_hash_context *ctx, const void *buffer, size_t len)

void
guix_hash_final (void *resbuf, struct guix_hash_context *ctx,
		 gcry_md_algo_t algo)
		 int algo)
{
  memcpy (resbuf, gcry_md_read (ctx->md_handle, algo),
	  gcry_md_get_algo_dlen (algo));

M nix/libutil/gcrypt-hash.hh => nix/libutil/gcrypt-hash.hh +3 -3
@@ 1,5 1,5 @@
/* GNU Guix --- Functional package management for GNU
   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
   Copyright (C) 2012, 2013  Ludovic Courtès <ludo@gnu.org>

   This file is part of GNU Guix.



@@ 30,10 30,10 @@ struct guix_hash_context
  gcry_md_hd_t md_handle;
};

extern void guix_hash_init (struct guix_hash_context *ctx, gcry_md_algo_t algo);
extern void guix_hash_init (struct guix_hash_context *ctx, int algo);
extern void guix_hash_update (struct guix_hash_context *ctx, const void *buffer,
			      size_t len);
extern void guix_hash_final (void *resbuf, struct guix_hash_context *ctx,
			     gcry_md_algo_t algo);
			     int algo);

}