]>
Commit | Line | Data |
---|---|---|
cfdb710f JR |
1 | diff -ur syslog-ng-syslog-ng-3.27.1/lib/logsource.c syslog-ng-syslog-ng-3.27.1.32bit/lib/logsource.c |
2 | --- syslog-ng-syslog-ng-3.27.1/lib/logsource.c 2020-04-30 16:18:56.000000000 +0200 | |
3 | +++ syslog-ng-syslog-ng-3.27.1.32bit/lib/logsource.c 2020-05-09 11:36:21.539723717 +0200 | |
4 | @@ -57,7 +58,7 @@ | |
5 | return window_size_increment; | |
6 | } | |
7 | ||
8 | - guint32 remaining_window_size_increment = MAX(window_size_increment - old, 0); | |
9 | + guint32 remaining_window_size_increment = MAX((gssize)window_size_increment - old, 0); | |
10 | guint32 reclaimed = window_size_increment - remaining_window_size_increment; | |
11 | atomic_gssize_add(&self->pending_reclaimed, reclaimed); | |
12 | ||
13 | diff -ur syslog-ng-syslog-ng-3.27.1/lib/tests/test_window_size_counter.c syslog-ng-syslog-ng-3.27.1.32bit/lib/tests/test_window_size_counter.c | |
14 | --- syslog-ng-syslog-ng-3.27.1/lib/tests/test_window_size_counter.c 2020-04-30 16:18:56.000000000 +0200 | |
15 | +++ syslog-ng-syslog-ng-3.27.1.32bit/lib/tests/test_window_size_counter.c 2020-05-09 11:43:12.103043082 +0200 | |
16 | @@ -59,8 +59,8 @@ | |
17 | WindowSizeCounter c; | |
18 | gboolean suspended = FALSE; | |
19 | window_size_counter_set(&c, -1); | |
20 | - gint v = (gint)window_size_counter_get(&c, &suspended); | |
21 | - cr_assert_eq(v, -1); | |
22 | + gssize v = (gssize)window_size_counter_get(&c, &suspended); | |
23 | + cr_assert_eq(v, G_MAXLONG); | |
24 | } | |
25 | ||
26 | Test(test_window_size_counter, suspend_resume_multiple_times) |