Re: [PATCH]: BUILD/MINOR : cfgparse: parse_cpu_set under condition

2017-12-01 Thread Willy TARREAU
On Fri, Dec 01, 2017 at 03:00:13PM +, David CARLIER wrote:
> Hi,
> 
> Here a little patch proposal to compile this function only when needed.

Good catch, thank you David, now merged and backported.

Willy



[PATCH]: BUILD/MINOR : cfgparse: parse_cpu_set under condition

2017-12-01 Thread David CARLIER
Hi,

Here a little patch proposal to compile this function only when needed.

Hope it is good.

Thanks.
From 7a1053f25331d21e164eae30dc1bad2400914f8d Mon Sep 17 00:00:00 2001
From: David Carlier 
Date: Fri, 1 Dec 2017 09:14:02 +
Subject: [PATCH] BUILD/MINOR: haproxy: compiling config cpu parsing handling
 when needed

parse_cpu_set is only relevant where there is cpu affinity,
avoiding in the process compilation warning as well.
---
 src/cfgparse.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/cfgparse.c b/src/cfgparse.c
index e7e32cf9..b3202a68 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -646,6 +646,7 @@ int parse_process_number(const char *arg, unsigned long *proc, int *autoinc, cha
 	return 0;
 }
 
+#ifdef USE_CPU_AFFINITY
 /* Parse cpu sets. Each CPU set is either a unique number between 0 and
  *  or a range with two such numbers delimited by a dash
  * ('-'). Multiple CPU numbers or ranges may be specified. On success, it
@@ -687,6 +688,8 @@ static unsigned long parse_cpu_set(const char **args, unsigned long *cpu_set, ch
 	}
 	return 0;
 }
+#endif
+
 /*
  * parse a line in a  section. Returns the error code, 0 if OK, or
  * any combination of :
-- 
2.14.2