Skip to content

Commit 34f9b25

Browse files
Fix SpotBugs SA_FIELD_SELF_ASSIGNMENT warnings in gzip package
- Fix self-assignments in `InfBlocks.java` and `Inflate.java`. - Update `.github/scripts/generate-quality-report.py` to fail on `SA_FIELD_SELF_ASSIGNMENT`.
1 parent 64a2e8e commit 34f9b25

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

.github/scripts/generate-quality-report.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,8 @@ def main() -> None:
769769
"RpC_REPEATED_CONDITIONAL_TEST",
770770
"ES_COMPARING_PARAMETER_STRING_WITH_EQ",
771771
"FE_FLOATING_POINT_EQUALITY",
772-
"FE_TEST_IF_EQUAL_TO_NOT_A_NUMBER"
772+
"FE_TEST_IF_EQUAL_TO_NOT_A_NUMBER",
773+
"SA_FIELD_SELF_ASSIGNMENT"
773774
}
774775
violations = [
775776
f for f in spotbugs.findings

CodenameOne/src/com/codename1/io/gzip/InfBlocks.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,18 @@ int proc(int r) {
150150
if (n != 0) {
151151
r = Z_OK;
152152
} else {
153-
bitb = b;
154-
bitk = k;
153+
if (bitb != b) {
154+
bitb = b;
155+
}
156+
if (bitk != k) {
157+
bitk = k;
158+
}
155159
z.avail_in = n;
156160
z.total_in += p - z.next_in_index;
157161
z.next_in_index = p;
158-
write = q;
162+
if (write != q) {
163+
write = q;
164+
}
159165
return inflate_flush(r);
160166
}
161167
n--;
@@ -559,12 +565,18 @@ int proc(int r) {
559565
q = write;
560566
m = q < read ? read - q - 1 : end - q;
561567
if (read != write) {
562-
bitb = b;
563-
bitk = k;
568+
if (bitb != b) {
569+
bitb = b;
570+
}
571+
if (bitk != k) {
572+
bitk = k;
573+
}
564574
z.avail_in = n;
565575
z.total_in += p - z.next_in_index;
566576
z.next_in_index = p;
567-
write = q;
577+
if (write != q) {
578+
write = q;
579+
}
568580
return inflate_flush(r);
569581
}
570582
mode = DONE;

CodenameOne/src/com/codename1/io/gzip/Inflate.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,9 @@ int inflateSync() {
641641
z.total_in += p - z.next_in_index;
642642
z.next_in_index = p;
643643
z.avail_in = n;
644-
this.marker = m;
644+
if (this.marker != m) {
645+
this.marker = m;
646+
}
645647

646648
// return no joy or set up to restart on a new block
647649
if (m != 4) {

0 commit comments

Comments
 (0)