new upstream release (3.3.0); modify package compatibility for Stretch

[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
old mode 100755 (executable)
new mode 100644 (file)
index 13b46ca..dbf73e5
--- a/src/os_regex/os_regex_str.c
+++ b/src/os_regex/os_regex_str.c
@@ -1,74 +1,55 @@
-/*   $OSSEC, os_regex_str.c, v0.1, 2005/12/29, Daniel B. Cid$   */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
  * This program is a free software; you can redistribute it
  * and/or modify it under the terms of the GNU General Public
- * License (version 3) as published by the FSF - Free Software
+ * License (version 2) as published by the FSF - Free Software
  * Foundation
  */
 
-
 #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)
+/* Check if a specific string is numeric (like "129544") */
+int OS_StrIsNum(const char *str)
 {
-    if(str == NULL)
-        return(FALSE);
-        
-    while(*str != '\0')
-    {
-        if(!_IsD(*str))
-            return(FALSE); /* 0 */
-        str++;    
+    if (str == NULL) {
+        return (FALSE);
     }
 
-    return(TRUE);
-}
+    while (*str != '\0') {
+        if (!_IsD(*str)) {
+            return (FALSE);
+        }
+        str++;
+    }
 
+    return (TRUE);
+}
 
-/** int OS_StrHowClosedMatch(char *str1, char *str2) v0.1
- * Returns the number of characters that both strings
- * have in similar. 
- */
-int OS_StrHowClosedMatch(char *str1, char *str2)
+/* Return the number of characters that both strings have in common */
+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)
-    {
-        return(0);
+    if (!str1 || !str2) {
+        return (0);
     }
 
-    do
-    {
-        if(str1[count] != str2[count])
-        {
+    do {
+        if (str1[count] != str2[count]) {
             break;
         }
 
         count++;
-    }while((str1[count] != '\0') && (str2[count] != '\0'));
-    
-    return(count);
-}
-
+    } while ((str1[count] != '\0') && (str2[count] != '\0'));
 
+    return (count);
+}
 
-/** 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 */