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

[ossec-hids.git] / src / os_regex / examples / regex_str.c

diff --git a/src/os_regex/examples/regex_str.c b/src/os_regex/examples/regex_str.c
old mode 100755 (executable)
new mode 100644 (file)
index 08e6044..8def8ac
--- a/src/os_regex/examples/regex_str.c
+++ b/src/os_regex/examples/regex_str.c
@@ -7,57 +7,51 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Must be included */
 #include "os_regex.h"
 
-int main(int argc,char **argv)
+
+int main(int argc, char **argv)
 {
     int r_code = 0;
-    char **ret;
 
     /* OSRegex structure */
     OSRegex reg;
 
-    /* checking for arguments */
-    if(argc != 3)
-    {
-        printf("%s regex string\n",argv[0]);
+    /* Check for arguments */
+    if (argc != 3) {
+        printf("%s regex string\n", argv[0]);
         exit(1);
     }
 
-
     /* If the compilation failed, we don't need to free anything.
-     * We are passing the OS_RETURN_SUBSTRING because we wan't the
+     * We are passing the OS_RETURN_SUBSTRING because we want the
      * substrings back.
      */
-    if(OSRegex_Compile(argv[1], &reg, OS_RETURN_SUBSTRING))
-    {
-        char *retv;
+    if (OSRegex_Compile(argv[1], &reg, OS_RETURN_SUBSTRING)) {
+        const char *retv;
         /* If the execution succeeds, the substrings will be
          * at reg.sub_strings
          */
-        if((retv = OSRegex_Execute(argv[2], &reg)))
-        {
+        if ((retv = OSRegex_Execute(argv[2], &reg))) {
             int sub_size = 0;
+            char **ret;
             r_code = 1;
 
-            /* next pt */
+            /* Next pt */
             printf("next pt: '%s'\n", retv);
-            /* Assigning reg.sub_strings to ret */
+            /* Assign reg.sub_strings to ret */
             ret = reg.sub_strings;
 
             printf("substrings:\n");
-            while(*ret)
-            {
+            while (*ret) {
                 printf("  %d: !%s!\n", sub_size, *ret);
-                sub_size++; ret++;
+                sub_size++;
+                ret++;
             }
 
             /* We must free the substrings */
             OSRegex_FreeSubStrings(&reg);
-        }
-        else
-        {
+        } else {
             printf("Error: Didn't match.\n");
         }
 
@@ -65,11 +59,10 @@ int main(int argc,char **argv)
     }
 
     /* Compilation error */
-    else
-    {
+    else {
         printf("Error: Regex Compile Error: %d\n", reg.error);
     }
 
-    return(r_code);
+    return (r_code);
 }
-/* EOF */
+