Browse Source

[Minor] Save 8 bytes in rspamd_regexp_t

tags/3.1
Vsevolod Stakhov 2 years ago
parent
commit
f3b23bccaf
2 changed files with 0 additions and 39 deletions
  1. 0
    29
      src/libutil/regexp.c
  2. 0
    10
      src/libutil/regexp.h

+ 0
- 29
src/libutil/regexp.c View File

@@ -71,7 +71,6 @@ struct rspamd_regexp_s {
gint flags;
gint pcre_flags;
gint ncaptures;
gint nbackref;
};

struct rspamd_regexp_cache {
@@ -516,24 +515,12 @@ fin:
&ncaptures) == 0) {
res->ncaptures = ncaptures;
}

/* Check number of backrefs */
if (pcre_fullinfo (res->raw_re, res->extra, PCRE_INFO_BACKREFMAX,
&ncaptures) == 0) {
res->nbackref = ncaptures;
}
#else
/* Check number of captures */
if (pcre2_pattern_info (res->raw_re, PCRE2_INFO_CAPTURECOUNT,
&ncaptures) == 0) {
res->ncaptures = ncaptures;
}

/* Check number of backrefs */
if (pcre2_pattern_info (res->raw_re, PCRE2_INFO_BACKREFMAX,
&ncaptures) == 0) {
res->nbackref = ncaptures;
}
#endif

return res;
@@ -838,22 +825,6 @@ rspamd_regexp_get_pcre_flags (const rspamd_regexp_t *re)
return re->pcre_flags;
}

gint
rspamd_regexp_get_nbackrefs (const rspamd_regexp_t *re)
{
g_assert (re != NULL);

return re->nbackref;
}

gint
rspamd_regexp_get_ncaptures (const rspamd_regexp_t *re)
{
g_assert (re != NULL);

return re->ncaptures;
}

guint
rspamd_regexp_get_maxhits (const rspamd_regexp_t *re)
{

+ 0
- 10
src/libutil/regexp.h View File

@@ -161,16 +161,6 @@ guint rspamd_regexp_get_maxhits (const rspamd_regexp_t *re);
*/
guint rspamd_regexp_set_maxhits (rspamd_regexp_t *re, guint new_maxhits);

/**
* Returns number of backreferences in a regexp
*/
gint rspamd_regexp_get_nbackrefs (const rspamd_regexp_t *re);

/**
* Returns number of capture groups in a regexp
*/
gint rspamd_regexp_get_ncaptures (const rspamd_regexp_t *re);

/**
* Returns cache id for a regexp
*/

Loading…
Cancel
Save