summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-05-29 15:32:43 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-05-29 15:32:43 +0000
commit4d45e1d9b2feecd408d1170b826a2f12a4ebea1e (patch)
tree02c33133df099a8412da12b4881e55d8c76b0a7b /src
parent20460b95142289aaa1cd057684dfcdfe21a3d60b (diff)
- resv.c: move valid_wild_card_simple() to conf.c
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2131 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'src')
-rw-r--r--src/conf.c31
-rw-r--r--src/resv.c31
2 files changed, 31 insertions, 31 deletions
diff --git a/src/conf.c b/src/conf.c
index 84149c1..2704e52 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1754,6 +1754,37 @@ valid_tkline(const char *p, int minutes)
return result;
}
+/* valid_wild_card_simple()
+ *
+ * inputs - data to check for sufficient non-wildcard characters
+ * outputs - 1 if valid, else 0
+ * side effects - none
+ */
+int
+valid_wild_card_simple(const char *data)
+{
+ const unsigned char *p = (const unsigned char *)data;
+ unsigned char tmpch = '\0';
+ int nonwild = 0;
+
+ while ((tmpch = *p++))
+ {
+ if (tmpch == '\\')
+ {
+ ++p;
+ if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
+ return 1;
+ }
+ else if (!IsMWildChar(tmpch))
+ {
+ if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
/* valid_wild_card()
*
* input - pointer to client
diff --git a/src/resv.c b/src/resv.c
index 1f5b057..29380b2 100644
--- a/src/resv.c
+++ b/src/resv.c
@@ -186,34 +186,3 @@ match_find_resv(const char *name)
return NULL;
}
-
-/* valid_wild_card_simple()
- *
- * inputs - data to check for sufficient non-wildcard characters
- * outputs - 1 if valid, else 0
- * side effects - none
- */
-int
-valid_wild_card_simple(const char *data)
-{
- const unsigned char *p = (const unsigned char *)data;
- unsigned char tmpch = '\0';
- int nonwild = 0;
-
- while ((tmpch = *p++))
- {
- if (tmpch == '\\')
- {
- ++p;
- if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
- return 1;
- }
- else if (!IsMWildChar(tmpch))
- {
- if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
- return 1;
- }
- }
-
- return 0;
-}