Fix some compiler warnings

diff --git a/contrib/libucl/ucl_internal.h b/contrib/libucl/ucl_internal.h
index 31d6b1361383b405cd812360d4ff97e4aaa8731f..64938592aa9f8862a56066398775354cfd99830f 100644 (file)
--- a/contrib/libucl/ucl_internal.h
+++ b/contrib/libucl/ucl_internal.h
@@ -523,6 +523,34 @@ void ucl_emitter_print_key_msgpack (bool print_key,
                struct ucl_emitter_context *ctx,
                const ucl_object_t *obj);
 
+/**
+ * Fetch URL into a buffer
+ * @param url url to fetch
+ * @param buf pointer to buffer (must be freed by callee)
+ * @param buflen pointer to buffer length
+ * @param err pointer to error argument
+ * @param must_exist fail if cannot find a url
+ */
+bool ucl_fetch_url (const unsigned char *url,
+               unsigned char **buf,
+               size_t *buflen,
+               UT_string **err,
+               bool must_exist);
+
+/**
+ * Fetch a file and save results to the memory buffer
+ * @param filename filename to fetch
+ * @param len length of filename
+ * @param buf target buffer
+ * @param buflen target length
+ * @return
+ */
+bool ucl_fetch_file (const unsigned char *filename,
+               unsigned char **buf,
+               size_t *buflen,
+               UT_string **err,
+               bool must_exist);
+
 /**
  * Add new element to an object using the current merge strategy and priority
  * @param parser

diff --git a/src/rspamadm/fuzzy_merge.c b/src/rspamadm/fuzzy_merge.c
index fac5e0a45d5b61d62f184dea3317b9374e72d7dc..01d2e137cd426762d5d6c2400e81c6cf3f7c07fb 100644 (file)
--- a/src/rspamadm/fuzzy_merge.c
+++ b/src/rspamadm/fuzzy_merge.c
@@ -210,9 +210,11 @@ static guint
 rspamadm_op_hash (gconstpointer p)
 {
        const struct fuzzy_merge_op *op = p;
+       guint res;
 
        /* Uniformly distributed */
-       return *(guint *)op->digest;
+       memcpy (&res, op->digest, sizeof (res));
+       return res;
 }
 
 static gboolean