novi upstream verzije 2.8.3

[ossec-hids.git] / src / os_regex / os_regex_str.c

diff --git a/src/os_regex/os_regex_str.c b/src/os_regex/os_regex_str.c
index 2bc2212..cf23423 100755 (executable)
--- a/src/os_regex/os_regex_str.c
+++ b/src/os_regex/os_regex_str.c
@@ -13,13 +13,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
+#include "os_regex.h"
 #include "os_regex_internal.h"
 
 
 /** int OS_StrIsNum(char *str) v0.1
  * Checks if a specific string is numeric (like "129544")
  */
-int OS_StrIsNum(char *str)
+int OS_StrIsNum(const char *str)
 {
     if(str == NULL)
         return(FALSE);
@@ -39,9 +41,9 @@ int OS_StrIsNum(char *str)
  * Returns the number of characters that both strings
  * have in similar.
  */
-int OS_StrHowClosedMatch(char *str1, char *str2)
+size_t OS_StrHowClosedMatch(const char *str1, const char *str2)
 {
-    int count = 0;
+    size_t count = 0;
 
     /* They don't match if any of them is null */
     if(!str1 || !str2)
@@ -63,12 +65,4 @@ int OS_StrHowClosedMatch(char *str1, char *str2)
 }
 
 
-
-/** int OS_StrStartsWith(char *str, char *pattern) v0.1
- * Verifies if a string starts with the provided pattern.
- * Returns 1 on success or 0 on failure.
- */
-#define startswith(x,y) (strncmp(x,y,strlen(y)) == 0?1:0)
-#define OS_StrStartsWith startswith
-
 /* EOF */