swtpm: Move ARRAY_LEN and min #define's to swtpm_utils.h

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

src/swtpm/Makefile.am

@@ -68,6 +68,7 @@ libswtpm_libtpms_la_CFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/include/swtpm \
+	-I$(top_srcdir)/src/utils \
 	$(MY_CFLAGS) \
 	$(CFLAGS) \
 	$(HARDENING_CFLAGS) \
@@ -105,6 +106,7 @@ swtpm_CFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/include/swtpm \
+	-I$(top_srcdir)/src/utils \
 	$(MY_CFLAGS) \
 	$(HARDENING_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -131,6 +133,7 @@ swtpm_cuse_CFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/include/swtpm \
+	-I$(top_srcdir)/src/utils \
 	$(MY_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBFUSE_CFLAGS) \

src/swtpm/ctrlchannel.c

@@ -61,6 +61,7 @@
 #include "mainloop.h"
 #include "utils.h"
 #include "swtpm_debug.h"
+#include "swtpm_utils.h"
 
 /* local variables */
 

src/swtpm/cuse_tpm.c

@@ -78,6 +78,7 @@
 #include "seccomp_profile.h"
 #include "options.h"
 #include "capabilities.h"
+#include "swtpm_utils.h"
 
 /* maximum size of request buffer */
 #define TPM_REQ_MAX 4096

src/swtpm/mainloop.c

@@ -65,6 +65,7 @@
 #include "utils.h"
 #include "sys_dependencies.h"
 #include "compiler_dependencies.h"
+#include "swtpm_utils.h"
 
 /* local variables */
 static TPM_MODIFIER_INDICATOR locality;

src/swtpm/seccomp_profile.c

@@ -47,6 +47,7 @@
 #include "logging.h"
 #include "utils.h"
 #include "seccomp_profile.h"
+#include "swtpm_utils.h"
 
 #ifdef WITH_SECCOMP
 static int create_seccomp_profile_add_rules(scmp_filter_ctx ctx,

src/swtpm/swtpm_nvstore.c

@@ -87,6 +87,7 @@
 #include "swtpm_aes.h"
 #include "swtpm_debug.h"
 #include "swtpm_nvstore.h"
+#include "swtpm_utils.h"
 #include "key.h"
 #include "logging.h"
 #include "tpmstate.h"

src/swtpm/tpmlib.c

@@ -58,6 +58,7 @@
 #endif
 #include "utils.h"
 #include "compiler_dependencies.h"
+#include "swtpm_utils.h"
 
 /*
  * convert the blobtype integer into a string that libtpms

src/swtpm/utils.h

@@ -45,9 +45,6 @@
 
 #include <libtpms/tpm_library.h>
 
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#define ARRAY_LEN(a) (sizeof(a) / sizeof((a)[0]))
-
 #define ROUND_TO_NEXT_POWER_OF_2_32(a) \
     do { \
       a--; \

src/utils/swtpm_utils.h

@@ -14,7 +14,8 @@
 
 #include <glib.h>
 
-#define min(X,Y) (X) < (Y) ? (X) : (Y)
+#define min(X,Y) ((X) < (Y) ? (X) : (Y))
+#define ARRAY_LEN(a) (sizeof(a) / sizeof((a)[0]))
 
 extern gchar *gl_LOGFILE;