regcomp whitespace changes

diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
index 354a352..470cfe9 100644 (file)
--- a/src/lib/valuepair.c
+++ b/src/lib/valuepair.c
@@ -2626,8 +2626,7 @@ int paircmp(VALUE_PAIR *one, VALUE_PAIR *two)
                        regex_t reg;
                        char buffer[MAX_STRING_LEN * 4 + 1];
 
-                       compare = regcomp(&reg, one->vp_strvalue,
-                                         REG_EXTENDED);
+                       compare = regcomp(&reg, one->vp_strvalue, REG_EXTENDED);
                        if (compare != 0) {
                                regerror(compare, &reg, buffer, sizeof(buffer));
                                fr_strerror_printf("Illegal regular expression in attribute: %s: %s",

diff --git a/src/main/evaluate.c b/src/main/evaluate.c
index 4e4f30b..c60f839 100644 (file)
--- a/src/main/evaluate.c
+++ b/src/main/evaluate.c
@@ -233,7 +233,7 @@ int radius_evaluate_tmpl(REQUEST *request, int modreturn, UNUSED int depth,
 }
 
 
-static int do_regex(REQUEST *request, const char *lhs, const char *rhs, int iflag)
+static int do_regex(REQUEST *request, const char *lhs, const char *rhs, bool iflag)
 {
        int i, compare;
        int cflags = REG_EXTENDED;

diff --git a/src/main/realms.c b/src/main/realms.c
index 6ef4373..fc05bca 100644 (file)
--- a/src/main/realms.c
+++ b/src/main/realms.c
@@ -1667,8 +1667,7 @@ static int realm_add(realm_config_t *rc, CONF_SECTION *cs)
                /*
                 *      Include substring matches.
                 */
-               rcode = regcomp(&reg, name2 + 1,
-                               REG_EXTENDED | REG_NOSUB | REG_ICASE);
+               rcode = regcomp(&reg, name2 + 1, REG_EXTENDED | REG_NOSUB | REG_ICASE);
                if (rcode != 0) {
                        char buffer[256];
 
@@ -2038,8 +2037,7 @@ REALM *realm_find(char const *name)
                        /*
                         *      Include substring matches.
                         */
-                       if (regcomp(&reg, this->realm->name + 1,
-                                   REG_EXTENDED | REG_NOSUB | REG_ICASE) != 0) {
+                       if (regcomp(&reg, this->realm->name + 1, REG_EXTENDED | REG_NOSUB | REG_ICASE) != 0) {
                                continue;
                        }
 

diff --git a/src/main/valuepair.c b/src/main/valuepair.c
index 4012daa..c05cf3c 100644 (file)
--- a/src/main/valuepair.c
+++ b/src/main/valuepair.c
@@ -182,8 +182,7 @@ int radius_compare_vps(REQUEST *request, VALUE_PAIR *check, VALUE_PAIR *vp)
                /*
                 *      Include substring matches.
                 */
-               compare = regcomp(&reg, check->vp_strvalue,
-                                 REG_EXTENDED);
+               compare = regcomp(&reg, check->vp_strvalue, REG_EXTENDED);
                if (compare != 0) {
                        char buffer[256];
                        regerror(compare, &reg, buffer, sizeof(buffer));