From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 27 Oct 2018 17:55:44 +0000 (+0100)
Subject: [Minor] Convert some enums to static macros
X-Git-Tag: 1.8.2~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccc9d0065dfecdac39ae26c5e3f824102131a0c8;p=thirdparty%2Frspamd.git

[Minor] Convert some enums to static macros
---

diff --git a/contrib/librdns/rdns.h b/contrib/librdns/rdns.h
index 8aca1f9f69..016903ba60 100644
--- a/contrib/librdns/rdns.h
+++ b/contrib/librdns/rdns.h
@@ -105,7 +105,7 @@ union rdns_reply_element_un {
 
 struct rdns_reply_entry {
 	union rdns_reply_element_un content;
-	uint16_t type;
+	enum rdns_request_type type;
 	int32_t ttl;
 	struct rdns_reply_entry *prev, *next;
 };
diff --git a/src/libcryptobox/blake2/blake2.h b/src/libcryptobox/blake2/blake2.h
index 9966c66d29..3da1958aeb 100644
--- a/src/libcryptobox/blake2/blake2.h
+++ b/src/libcryptobox/blake2/blake2.h
@@ -20,13 +20,13 @@
 extern "C" {
 #endif
 
-enum blake2b_constant {
-	BLAKE2B_BLOCKBYTES = 128,
-	BLAKE2B_OUTBYTES = 64,
-	BLAKE2B_KEYBYTES = 64,
-	BLAKE2B_SALTBYTES = 16,
-	BLAKE2B_PERSONALBYTES = 16
-};
+
+#define BLAKE2B_BLOCKBYTES 128
+#define BLAKE2B_OUTBYTES 64
+#define BLAKE2B_KEYBYTES 64
+#define BLAKE2B_SALTBYTES 16
+#define BLAKE2B_PERSONALBYTES 16
+
 
 typedef struct blake2b_state_t {
 	unsigned char opaque[256];
diff --git a/src/libcryptobox/chacha20/chacha.h b/src/libcryptobox/chacha20/chacha.h
index f69a63db98..7f93a45179 100644
--- a/src/libcryptobox/chacha20/chacha.h
+++ b/src/libcryptobox/chacha20/chacha.h
@@ -26,9 +26,8 @@
 #ifndef CHACHA_H_
 #define CHACHA_H_
 
-enum chacha_constants {
-	CHACHA_BLOCKBYTES = 64,
-};
+
+#define CHACHA_BLOCKBYTES 64
 
 typedef struct chacha_state_internal_t {
 	unsigned char s[48];
diff --git a/src/libcryptobox/poly1305/ref-64.c b/src/libcryptobox/poly1305/ref-64.c
index 48d5fbcc6b..cceb1476d0 100644
--- a/src/libcryptobox/poly1305/ref-64.c
+++ b/src/libcryptobox/poly1305/ref-64.c
@@ -7,9 +7,8 @@
 #include "config.h"
 #include "poly1305.h"
 #include "poly1305_internal.h"
-enum {
-	POLY1305_BLOCK_SIZE = 16
-};
+
+#define POLY1305_BLOCK_SIZE 16
 
 typedef struct poly1305_state_ref_t {
 	uint64_t r[3];
diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index a6f1adaf8b..5cbc1c0447 100644
--- a/src/libutil/addr.c
+++ b/src/libutil/addr.c
@@ -1055,7 +1055,7 @@ rspamd_inet_address_listen (const rspamd_inet_addr_t *addr, gint type,
 		}
 	}
 
-	if (type != SOCK_DGRAM) {
+	if (type != (int)SOCK_DGRAM) {
 
 		if (addr->af == AF_UNIX) {
 			path = addr->u.un->addr.sun_path;