Changeset 588 for trunk/src/sh_string.c

Timestamp:

Oct 26, 2025, 12:17:47 PM (16 hours ago)

Author:

katerina

Message:

Fix for ticket #476 (move logfile monitoring module from PCRE to PCRE2).

File:

• trunk/src/sh_string.c (modified) (6 diffs)

trunk/src/sh_string.c

@@ -546 +546 @@
  * of field, offset of first char after field (this is how
  * the pcre library does it).
- */  
+ */
+#define IS_PCRE2_UNSET           (~(size_t)0)
+
 sh_string * sh_string_replace(const sh_string * s, 
-                              const int * ovector, int ovecnum, 
+                              const size_t * ovector, int ovecnum, 
                               const char * replacement, size_t rlen)
 {
@@ -604 +606 @@
   for (i = 0; i < ovecnum; ++i)
     {
-      if (ovector[2*i] >= 0)
+      if (ovector[2*i] != IS_PCRE2_UNSET)
         {
           curr = 2*i;
@@ -611 +613 @@
     }
   
-  if (r && ovecnum > 0 && ovector[curr] >= 0)
+  if (r && ovecnum > 0 && ovector[curr] != IS_PCRE2_UNSET)
     {
       r->len = 0; r->str[0] = '\0'; p = r->str;
@@ -617 +619 @@
       /* First part, until start of first replacement 
        */
-      if (r->siz > (unsigned int)ovector[curr]) {
-        memcpy(p, s->str, (size_t)ovector[curr]); 
+      if (r->siz > ovector[curr]) {
+        memcpy(p, s->str, ovector[curr]); 
         p += ovector[curr]; 
         r->len += ovector[curr];
@@ -633 +635 @@
       for (i = 1; i < ovecnum; ++i)
         {
-          if (ovector[2*i] < 0)
+          if (ovector[2*i] == IS_PCRE2_UNSET)
             continue;
 
@@ -704 +706 @@
   size_t lengths[16];
   unsigned int iarr;
-  int ovector[16];
+  size_t ovector[16];
   int ovecnum;