summaryrefslogtreecommitdiffstats
path: root/src/libutil/diff.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libutil/diff.c')
-rw-r--r--src/libutil/diff.c88
1 files changed, 42 insertions, 46 deletions
diff --git a/src/libutil/diff.c b/src/libutil/diff.c
index cee175ceb..4038d8680 100644
--- a/src/libutil/diff.c
+++ b/src/libutil/diff.c
@@ -39,8 +39,8 @@
#include "diff.h"
-#define FV(k) _v (ctx, (k), 0)
-#define RV(k) _v (ctx, (k), 1)
+#define FV(k) _v(ctx, (k), 0)
+#define RV(k) _v(ctx, (k), 1)
#define MAX_DIFF 1024
@@ -58,8 +58,7 @@ struct middle_snake
};
static
-void
-maybe_resize_array (GArray *arr, guint k)
+void maybe_resize_array(GArray *arr, guint k)
{
if (k > arr->len) {
g_array_set_size (arr, k);
@@ -68,7 +67,7 @@ maybe_resize_array (GArray *arr, guint k)
}
static void
-_setv (struct _ctx *ctx, gint k, gint r, gint val)
+_setv(struct _ctx *ctx, gint k, gint r, gint val)
{
gint j;
gint *i;
@@ -82,7 +81,7 @@ _setv (struct _ctx *ctx, gint k, gint r, gint val)
}
static gint
-_v (struct _ctx *ctx, gint k, gint r)
+_v(struct _ctx *ctx, gint k, gint r)
{
gint j;
@@ -92,8 +91,8 @@ _v (struct _ctx *ctx, gint k, gint r)
}
static gint
-_find_middle_snake (const void *a, gint aoff, gint n, const void *b,
- gint boff, gint m, struct _ctx *ctx, struct middle_snake *ms)
+_find_middle_snake(const void *a, gint aoff, gint n, const void *b,
+ gint boff, gint m, struct _ctx *ctx, struct middle_snake *ms)
{
gint delta, odd, mid, d;
@@ -102,7 +101,7 @@ _find_middle_snake (const void *a, gint aoff, gint n, const void *b,
mid = (n + m) / 2;
mid += odd;
- _setv (ctx, 1, 0, 0);
+ _setv (ctx, 1, 0, 0);
_setv (ctx, delta - 1, 1, n);
for (d = 0; d <= mid; d++) {
@@ -113,11 +112,11 @@ _find_middle_snake (const void *a, gint aoff, gint n, const void *b,
}
for (k = d; k >= -d; k -= 2) {
- if (k == -d || (k != d && FV (k - 1) < FV (k + 1))) {
- x = FV (k + 1);
+ if (k == -d || (k != d && FV(k - 1) < FV(k + 1))) {
+ x = FV(k + 1);
}
else {
- x = FV (k - 1) + 1;
+ x = FV(k - 1) + 1;
}
y = x - k;
@@ -132,7 +131,7 @@ _find_middle_snake (const void *a, gint aoff, gint n, const void *b,
_setv (ctx, k, 0, x);
if (odd && k >= (delta - (d - 1)) && k <= (delta + (d - 1))) {
- if (x >= RV (k)) {
+ if (x >= RV(k)) {
ms->u = x;
ms->v = y;
return 2 * d - 1;
@@ -142,11 +141,11 @@ _find_middle_snake (const void *a, gint aoff, gint n, const void *b,
for (k = d; k >= -d; k -= 2) {
gint kr = (n - m) + k;
- if (k == d || (k != -d && RV (kr - 1) < RV (kr + 1))) {
- x = RV (kr - 1);
+ if (k == d || (k != -d && RV(kr - 1) < RV(kr + 1))) {
+ x = RV(kr - 1);
}
else {
- x = RV (kr + 1) - 1;
+ x = RV(kr + 1) - 1;
}
y = x - kr;
@@ -161,7 +160,7 @@ _find_middle_snake (const void *a, gint aoff, gint n, const void *b,
_setv (ctx, kr, 1, x);
if (!odd && kr >= -d && kr <= d) {
- if (x <= FV (kr)) {
+ if (x <= FV(kr)) {
ms->x = x;
ms->y = y;
return 2 * d;
@@ -176,7 +175,7 @@ _find_middle_snake (const void *a, gint aoff, gint n, const void *b,
}
static void
-_edit (struct _ctx *ctx, gint op, gint off, gint len)
+_edit(struct _ctx *ctx, gint op, gint off, gint len)
{
struct diff_edit *e = NULL, newe;
@@ -202,8 +201,8 @@ _edit (struct _ctx *ctx, gint op, gint off, gint len)
}
static gint
-_ses (const void *a, gint aoff, gint n, const void *b, gint boff,
- gint m, struct _ctx *ctx)
+_ses(const void *a, gint aoff, gint n, const void *b, gint boff,
+ gint m, struct _ctx *ctx)
{
struct middle_snake ms = {
.x = 0,
@@ -270,22 +269,22 @@ _ses (const void *a, gint aoff, gint n, const void *b, gint boff,
if (m > n) {
if (x == u) {
- _edit (ctx, DIFF_MATCH, aoff, n);
+ _edit (ctx, DIFF_MATCH, aoff, n);
_edit (ctx, DIFF_INSERT, boff + (m - 1), 1);
}
else {
_edit (ctx, DIFF_INSERT, boff, 1);
- _edit (ctx, DIFF_MATCH, aoff, n);
+ _edit (ctx, DIFF_MATCH, aoff, n);
}
}
else {
if (x == u) {
- _edit (ctx, DIFF_MATCH, aoff, m);
+ _edit (ctx, DIFF_MATCH, aoff, m);
_edit (ctx, DIFF_DELETE, aoff + (n - 1), 1);
}
else {
- _edit (ctx, DIFF_DELETE, aoff, 1);
- _edit (ctx, DIFF_MATCH, aoff + 1, m);
+ _edit (ctx, DIFF_DELETE, aoff, 1);
+ _edit (ctx, DIFF_MATCH, aoff + 1, m);
}
}
}
@@ -295,8 +294,8 @@ _ses (const void *a, gint aoff, gint n, const void *b, gint boff,
}
gint
-rspamd_diff (const void *a, gint aoff, gint n, const void *b, gint boff, gint m,
- gint dmax, GArray *ses, gint *sn)
+rspamd_diff(const void *a, gint aoff, gint n, const void *b, gint boff, gint m,
+ gint dmax, GArray *ses, gint *sn)
{
struct _ctx ctx;
gint d, x, y;
@@ -346,14 +345,14 @@ compare_diff_distance_unnormalized (f_str_t *s1, f_str_t *s2)
ses = g_array_sized_new (FALSE, TRUE, sizeof (struct diff_edit), MAX_DIFF);
if (rspamd_diff (s1->begin, 0, s1->len,
- s2->begin, 0, s2->len, MAX_DIFF, ses, NULL) == -1) {
+ s2->begin, 0, s2->len, MAX_DIFF, ses, NULL) == -1) {
/* Diff failed, strings are different */
g_array_free (ses, TRUE);
return 0;
}
- for (i = 0; i < ses->len; i++) {
- e = &g_array_index (ses, struct diff_edit, i);
+ for (i = 0; i < ses->len; i ++) {
+ e = &g_array_index(ses, struct diff_edit, i);
if (e->op != DIFF_MATCH) {
distance += e->len;
}
@@ -368,10 +367,7 @@ guint32
compare_diff_distance (f_str_t *s1, f_str_t *s2)
{
- return 100 -
- (2 *
- compare_diff_distance_unnormalized (s1,
- s2) * 100) / (s1->len + s2->len);
+ return 100 - (2 * compare_diff_distance_unnormalized (s1, s2) * 100) / (s1->len + s2->len);
}
@@ -398,9 +394,9 @@ compare_diff_distance_normalized (f_str_t *s1, f_str_t *s2)
if (!g_ascii_isspace (*h)) {
*t++ = g_ascii_tolower (*h);
}
- h++;
- p1++;
- r1--;
+ h ++;
+ p1 ++;
+ r1 --;
}
t1.begin = b1;
@@ -413,9 +409,9 @@ compare_diff_distance_normalized (f_str_t *s1, f_str_t *s2)
if (!g_ascii_isspace (*h)) {
*t++ = g_ascii_tolower (*h);
}
- h++;
- p2++;
- r2--;
+ h ++;
+ p2 ++;
+ r2 --;
}
t2.begin = b2;
@@ -428,20 +424,20 @@ compare_diff_distance_normalized (f_str_t *s1, f_str_t *s2)
h = p1;
while (r1 > 0) {
if (!g_ascii_isspace (*h)) {
- cur_diff++;
+ cur_diff ++;
}
- r1--;
- h++;
+ r1 --;
+ h ++;
}
}
else if (r2 > 0) {
h = p2;
while (r2 > 0) {
if (!g_ascii_isspace (*h)) {
- cur_diff++;
+ cur_diff ++;
}
- r2--;
- h++;
+ r2 --;
+ h ++;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-06 15:12:39 +0000