aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/bunzip2.c88
-rw-r--r--archival/dpkg.c6
-rw-r--r--archival/gunzip.c2
-rw-r--r--archival/libunarchive/unarchive.c4
-rw-r--r--archival/tar.c8
5 files changed, 54 insertions, 54 deletions
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index c07fe1892..b0a11fd83 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -626,7 +626,7 @@ int BZ2_decompress(DState *s)
626 switch (switch_val) { 626 switch (switch_val) {
627 case BZ_X_MAGIC_1: 627 case BZ_X_MAGIC_1:
628 s->state = BZ_X_MAGIC_1; 628 s->state = BZ_X_MAGIC_1;
629 if (get_bits(s, &uc, 8) == FALSE) { 629 if (! get_bits(s, &uc, 8)) {
630 retVal = BZ_OK; 630 retVal = BZ_OK;
631 goto save_state_and_return; 631 goto save_state_and_return;
632 } 632 }
@@ -637,7 +637,7 @@ int BZ2_decompress(DState *s)
637 637
638 case BZ_X_MAGIC_2: 638 case BZ_X_MAGIC_2:
639 s->state = BZ_X_MAGIC_2; 639 s->state = BZ_X_MAGIC_2;
640 if (get_bits(s, &uc, 8) == FALSE) { 640 if (! get_bits(s, &uc, 8)) {
641 retVal = BZ_OK; 641 retVal = BZ_OK;
642 goto save_state_and_return; 642 goto save_state_and_return;
643 } 643 }
@@ -648,7 +648,7 @@ int BZ2_decompress(DState *s)
648 648
649 case BZ_X_MAGIC_3: 649 case BZ_X_MAGIC_3:
650 s->state = BZ_X_MAGIC_3; 650 s->state = BZ_X_MAGIC_3;
651 if (get_bits(s, &uc, 8) == FALSE) { 651 if (! get_bits(s, &uc, 8)) {
652 retVal = BZ_OK; 652 retVal = BZ_OK;
653 goto save_state_and_return; 653 goto save_state_and_return;
654 } 654 }
@@ -659,7 +659,7 @@ int BZ2_decompress(DState *s)
659 659
660 case BZ_X_MAGIC_4: 660 case BZ_X_MAGIC_4:
661 s->state = BZ_X_MAGIC_4; 661 s->state = BZ_X_MAGIC_4;
662 if (get_bits(s, &s->blockSize100k, 8) == FALSE) { 662 if (! get_bits(s, &s->blockSize100k, 8)) {
663 retVal = BZ_OK; 663 retVal = BZ_OK;
664 goto save_state_and_return; 664 goto save_state_and_return;
665 } 665 }
@@ -687,7 +687,7 @@ int BZ2_decompress(DState *s)
687 687
688 case BZ_X_BLKHDR_1: 688 case BZ_X_BLKHDR_1:
689 s->state = BZ_X_BLKHDR_1; 689 s->state = BZ_X_BLKHDR_1;
690 if (get_bits(s, &uc, 8) == FALSE) { 690 if (! get_bits(s, &uc, 8)) {
691 retVal = BZ_OK; 691 retVal = BZ_OK;
692 goto save_state_and_return; 692 goto save_state_and_return;
693 } 693 }
@@ -702,7 +702,7 @@ int BZ2_decompress(DState *s)
702 702
703 case BZ_X_BLKHDR_2: 703 case BZ_X_BLKHDR_2:
704 s->state = BZ_X_BLKHDR_2; 704 s->state = BZ_X_BLKHDR_2;
705 if (get_bits(s, &uc, 8) == FALSE) { 705 if (! get_bits(s, &uc, 8)) {
706 retVal = BZ_OK; 706 retVal = BZ_OK;
707 goto save_state_and_return; 707 goto save_state_and_return;
708 } 708 }
@@ -713,7 +713,7 @@ int BZ2_decompress(DState *s)
713 713
714 case BZ_X_BLKHDR_3: 714 case BZ_X_BLKHDR_3:
715 s->state = BZ_X_BLKHDR_3; 715 s->state = BZ_X_BLKHDR_3;
716 if (get_bits(s, &uc, 8) == FALSE) { 716 if (! get_bits(s, &uc, 8)) {
717 retVal = BZ_OK; 717 retVal = BZ_OK;
718 goto save_state_and_return; 718 goto save_state_and_return;
719 } 719 }
@@ -724,7 +724,7 @@ int BZ2_decompress(DState *s)
724 724
725 case BZ_X_BLKHDR_4: 725 case BZ_X_BLKHDR_4:
726 s->state = BZ_X_BLKHDR_4; 726 s->state = BZ_X_BLKHDR_4;
727 if (get_bits(s, &uc, 8) == FALSE) { 727 if (! get_bits(s, &uc, 8)) {
728 retVal = BZ_OK; 728 retVal = BZ_OK;
729 goto save_state_and_return; 729 goto save_state_and_return;
730 } 730 }
@@ -735,7 +735,7 @@ int BZ2_decompress(DState *s)
735 735
736 case BZ_X_BLKHDR_5: 736 case BZ_X_BLKHDR_5:
737 s->state = BZ_X_BLKHDR_5; 737 s->state = BZ_X_BLKHDR_5;
738 if (get_bits(s, &uc, 8) == FALSE) { 738 if (! get_bits(s, &uc, 8)) {
739 retVal = BZ_OK; 739 retVal = BZ_OK;
740 goto save_state_and_return; 740 goto save_state_and_return;
741 } 741 }
@@ -746,7 +746,7 @@ int BZ2_decompress(DState *s)
746 746
747 case BZ_X_BLKHDR_6: 747 case BZ_X_BLKHDR_6:
748 s->state = BZ_X_BLKHDR_6; 748 s->state = BZ_X_BLKHDR_6;
749 if (get_bits(s, &uc, 8) == FALSE) { 749 if (! get_bits(s, &uc, 8)) {
750 retVal = BZ_OK; 750 retVal = BZ_OK;
751 goto save_state_and_return; 751 goto save_state_and_return;
752 } 752 }
@@ -763,7 +763,7 @@ int BZ2_decompress(DState *s)
763 763
764 case BZ_X_BCRC_1: 764 case BZ_X_BCRC_1:
765 s->state = BZ_X_BCRC_1; 765 s->state = BZ_X_BCRC_1;
766 if (get_bits(s, &uc, 8) == FALSE) { 766 if (! get_bits(s, &uc, 8)) {
767 retVal = BZ_OK; 767 retVal = BZ_OK;
768 goto save_state_and_return; 768 goto save_state_and_return;
769 } 769 }
@@ -771,7 +771,7 @@ int BZ2_decompress(DState *s)
771 771
772 case BZ_X_BCRC_2: 772 case BZ_X_BCRC_2:
773 s->state = BZ_X_BCRC_2; 773 s->state = BZ_X_BCRC_2;
774 if (get_bits(s, &uc, 8) == FALSE) { 774 if (! get_bits(s, &uc, 8)) {
775 retVal = BZ_OK; 775 retVal = BZ_OK;
776 goto save_state_and_return; 776 goto save_state_and_return;
777 } 777 }
@@ -779,7 +779,7 @@ int BZ2_decompress(DState *s)
779 779
780 case BZ_X_BCRC_3: 780 case BZ_X_BCRC_3:
781 s->state = BZ_X_BCRC_3; 781 s->state = BZ_X_BCRC_3;
782 if (get_bits(s, &uc, 8) == FALSE) { 782 if (! get_bits(s, &uc, 8)) {
783 retVal = BZ_OK; 783 retVal = BZ_OK;
784 goto save_state_and_return; 784 goto save_state_and_return;
785 } 785 }
@@ -787,7 +787,7 @@ int BZ2_decompress(DState *s)
787 787
788 case BZ_X_BCRC_4: 788 case BZ_X_BCRC_4:
789 s->state = BZ_X_BCRC_4; 789 s->state = BZ_X_BCRC_4;
790 if (get_bits(s, &uc, 8) == FALSE) { 790 if (! get_bits(s, &uc, 8)) {
791 retVal = BZ_OK; 791 retVal = BZ_OK;
792 goto save_state_and_return; 792 goto save_state_and_return;
793 } 793 }
@@ -799,7 +799,7 @@ int BZ2_decompress(DState *s)
799 int tmp = s->blockRandomised; 799 int tmp = s->blockRandomised;
800 const int ret = get_bits(s, &tmp, 1); 800 const int ret = get_bits(s, &tmp, 1);
801 s->blockRandomised = tmp; 801 s->blockRandomised = tmp;
802 if (ret == FALSE) { 802 if (! ret) {
803 retVal = BZ_OK; 803 retVal = BZ_OK;
804 goto save_state_and_return; 804 goto save_state_and_return;
805 } 805 }
@@ -809,7 +809,7 @@ int BZ2_decompress(DState *s)
809 809
810 case BZ_X_ORIGPTR_1: 810 case BZ_X_ORIGPTR_1:
811 s->state = BZ_X_ORIGPTR_1; 811 s->state = BZ_X_ORIGPTR_1;
812 if (get_bits(s, &uc, 8) == FALSE) { 812 if (! get_bits(s, &uc, 8)) {
813 retVal = BZ_OK; 813 retVal = BZ_OK;
814 goto save_state_and_return; 814 goto save_state_and_return;
815 } 815 }
@@ -817,7 +817,7 @@ int BZ2_decompress(DState *s)
817 817
818 case BZ_X_ORIGPTR_2: 818 case BZ_X_ORIGPTR_2:
819 s->state = BZ_X_ORIGPTR_2; 819 s->state = BZ_X_ORIGPTR_2;
820 if (get_bits(s, &uc, 8) == FALSE) { 820 if (! get_bits(s, &uc, 8)) {
821 retVal = BZ_OK; 821 retVal = BZ_OK;
822 goto save_state_and_return; 822 goto save_state_and_return;
823 } 823 }
@@ -825,7 +825,7 @@ int BZ2_decompress(DState *s)
825 825
826 case BZ_X_ORIGPTR_3: 826 case BZ_X_ORIGPTR_3:
827 s->state = BZ_X_ORIGPTR_3; 827 s->state = BZ_X_ORIGPTR_3;
828 if (get_bits(s, &uc, 8) == FALSE) { 828 if (! get_bits(s, &uc, 8)) {
829 retVal = BZ_OK; 829 retVal = BZ_OK;
830 goto save_state_and_return; 830 goto save_state_and_return;
831 } 831 }
@@ -844,7 +844,7 @@ int BZ2_decompress(DState *s)
844 case BZ_X_MAPPING_1: 844 case BZ_X_MAPPING_1:
845 for (i = 0; i < 16; i++) { 845 for (i = 0; i < 16; i++) {
846 s->state = BZ_X_MAPPING_1; 846 s->state = BZ_X_MAPPING_1;
847 if (get_bits(s, &uc, 1) == FALSE) { 847 if (! get_bits(s, &uc, 1)) {
848 retVal = BZ_OK; 848 retVal = BZ_OK;
849 goto save_state_and_return; 849 goto save_state_and_return;
850 } 850 }
@@ -864,7 +864,7 @@ int BZ2_decompress(DState *s)
864 for (j = 0; j < 16; j++) { 864 for (j = 0; j < 16; j++) {
865 case BZ_X_MAPPING_2: 865 case BZ_X_MAPPING_2:
866 s->state = BZ_X_MAPPING_2; 866 s->state = BZ_X_MAPPING_2;
867 if (get_bits(s, &uc, 1) == FALSE) { 867 if (! get_bits(s, &uc, 1)) {
868 retVal = BZ_OK; 868 retVal = BZ_OK;
869 goto save_state_and_return; 869 goto save_state_and_return;
870 } 870 }
@@ -891,7 +891,7 @@ int BZ2_decompress(DState *s)
891 /*--- Now the selectors ---*/ 891 /*--- Now the selectors ---*/
892 case BZ_X_SELECTOR_1: 892 case BZ_X_SELECTOR_1:
893 s->state = BZ_X_SELECTOR_1; 893 s->state = BZ_X_SELECTOR_1;
894 if (get_bits(s, &nGroups, 3) == FALSE) { 894 if (! get_bits(s, &nGroups, 3)) {
895 retVal = BZ_OK; 895 retVal = BZ_OK;
896 goto save_state_and_return; 896 goto save_state_and_return;
897 } 897 }
@@ -902,7 +902,7 @@ int BZ2_decompress(DState *s)
902 902
903 case BZ_X_SELECTOR_2: 903 case BZ_X_SELECTOR_2:
904 s->state = BZ_X_SELECTOR_2; 904 s->state = BZ_X_SELECTOR_2;
905 if (get_bits(s, &nSelectors, 15) == FALSE) { 905 if (! get_bits(s, &nSelectors, 15)) {
906 retVal = BZ_OK; 906 retVal = BZ_OK;
907 goto save_state_and_return; 907 goto save_state_and_return;
908 } 908 }
@@ -918,7 +918,7 @@ int BZ2_decompress(DState *s)
918 while (1) { 918 while (1) {
919 case BZ_X_SELECTOR_3: 919 case BZ_X_SELECTOR_3:
920 s->state = BZ_X_SELECTOR_3; 920 s->state = BZ_X_SELECTOR_3;
921 if (get_bits(s, &uc, 1) == FALSE) { 921 if (! get_bits(s, &uc, 1)) {
922 retVal = BZ_OK; 922 retVal = BZ_OK;
923 goto save_state_and_return; 923 goto save_state_and_return;
924 } 924 }
@@ -956,7 +956,7 @@ int BZ2_decompress(DState *s)
956 for (t = 0; t < nGroups; t++) { 956 for (t = 0; t < nGroups; t++) {
957 case BZ_X_CODING_1: 957 case BZ_X_CODING_1:
958 s->state = BZ_X_CODING_1; 958 s->state = BZ_X_CODING_1;
959 if (get_bits(s, &curr, 5) == FALSE) { 959 if (! get_bits(s, &curr, 5)) {
960 retVal = BZ_OK; 960 retVal = BZ_OK;
961 goto save_state_and_return; 961 goto save_state_and_return;
962 } 962 }
@@ -969,7 +969,7 @@ int BZ2_decompress(DState *s)
969 969
970 case BZ_X_CODING_2: 970 case BZ_X_CODING_2:
971 s->state = BZ_X_CODING_2; 971 s->state = BZ_X_CODING_2;
972 if (get_bits(s, &uc, 1) == FALSE) { 972 if (! get_bits(s, &uc, 1)) {
973 retVal = BZ_OK; 973 retVal = BZ_OK;
974 goto save_state_and_return; 974 goto save_state_and_return;
975 } 975 }
@@ -979,7 +979,7 @@ int BZ2_decompress(DState *s)
979 979
980 case BZ_X_CODING_3: 980 case BZ_X_CODING_3:
981 s->state = BZ_X_CODING_3; 981 s->state = BZ_X_CODING_3;
982 if (get_bits(s, &uc, 1) == FALSE) { 982 if (! get_bits(s, &uc, 1)) {
983 retVal = BZ_OK; 983 retVal = BZ_OK;
984 goto save_state_and_return; 984 goto save_state_and_return;
985 } 985 }
@@ -1044,12 +1044,12 @@ int BZ2_decompress(DState *s)
1044 1044
1045 nblock = 0; 1045 nblock = 0;
1046 1046
1047 if (get_mtf_val_init() == FALSE) { 1047 if (! get_mtf_val_init()) {
1048 goto save_state_and_return; 1048 goto save_state_and_return;
1049 } 1049 }
1050 case BZ_X_MTF_1: 1050 case BZ_X_MTF_1:
1051 s->state = BZ_X_MTF_1; 1051 s->state = BZ_X_MTF_1;
1052 if (get_bits(s, &zvec, zn) == FALSE) { 1052 if (! get_bits(s, &zvec, zn)) {
1053 retVal = BZ_OK; 1053 retVal = BZ_OK;
1054 goto save_state_and_return; 1054 goto save_state_and_return;
1055 } 1055 }
@@ -1065,7 +1065,7 @@ int BZ2_decompress(DState *s)
1065 1065
1066 case BZ_X_MTF_2: 1066 case BZ_X_MTF_2:
1067 s->state = BZ_X_MTF_2; 1067 s->state = BZ_X_MTF_2;
1068 if (get_bits(s, &zj, 1) == FALSE) { 1068 if (! get_bits(s, &zj, 1)) {
1069 retVal = BZ_OK; 1069 retVal = BZ_OK;
1070 goto save_state_and_return; 1070 goto save_state_and_return;
1071 } 1071 }
@@ -1094,12 +1094,12 @@ int BZ2_decompress(DState *s)
1094 } 1094 }
1095 } 1095 }
1096 N = N * 2; 1096 N = N * 2;
1097 if (get_mtf_val_init() == FALSE) { 1097 if (! get_mtf_val_init()) {
1098 goto save_state_and_return; 1098 goto save_state_and_return;
1099 } 1099 }
1100 case BZ_X_MTF_3: 1100 case BZ_X_MTF_3:
1101 s->state = BZ_X_MTF_3; 1101 s->state = BZ_X_MTF_3;
1102 if (get_bits(s, &zvec, zn) == FALSE) { 1102 if (! get_bits(s, &zvec, zn)) {
1103 retVal = BZ_OK; 1103 retVal = BZ_OK;
1104 goto save_state_and_return; 1104 goto save_state_and_return;
1105 } 1105 }
@@ -1115,7 +1115,7 @@ int BZ2_decompress(DState *s)
1115 1115
1116 case BZ_X_MTF_4: 1116 case BZ_X_MTF_4:
1117 s->state = BZ_X_MTF_4; 1117 s->state = BZ_X_MTF_4;
1118 if (get_bits(s, &zj, 1) == FALSE) { 1118 if (! get_bits(s, &zj, 1)) {
1119 retVal = BZ_OK; 1119 retVal = BZ_OK;
1120 goto save_state_and_return; 1120 goto save_state_and_return;
1121 } 1121 }
@@ -1223,12 +1223,12 @@ int BZ2_decompress(DState *s)
1223 } 1223 }
1224 nblock++; 1224 nblock++;
1225 1225
1226 if (get_mtf_val_init() == FALSE) { 1226 if (! get_mtf_val_init()) {
1227 goto save_state_and_return; 1227 goto save_state_and_return;
1228 } 1228 }
1229 case BZ_X_MTF_5: 1229 case BZ_X_MTF_5:
1230 s->state = BZ_X_MTF_5; 1230 s->state = BZ_X_MTF_5;
1231 if (get_bits(s, &zvec, zn) == FALSE) { 1231 if (! get_bits(s, &zvec, zn)) {
1232 retVal = BZ_OK; 1232 retVal = BZ_OK;
1233 goto save_state_and_return; 1233 goto save_state_and_return;
1234 } 1234 }
@@ -1244,7 +1244,7 @@ int BZ2_decompress(DState *s)
1244 1244
1245 case BZ_X_MTF_6: 1245 case BZ_X_MTF_6:
1246 s->state = BZ_X_MTF_6; 1246 s->state = BZ_X_MTF_6;
1247 if (get_bits(s, &zj, 1) == FALSE) { 1247 if (! get_bits(s, &zj, 1)) {
1248 retVal = BZ_OK; 1248 retVal = BZ_OK;
1249 goto save_state_and_return; 1249 goto save_state_and_return;
1250 } 1250 }
@@ -1366,7 +1366,7 @@ int BZ2_decompress(DState *s)
1366endhdr_2: 1366endhdr_2:
1367 case BZ_X_ENDHDR_2: 1367 case BZ_X_ENDHDR_2:
1368 s->state = BZ_X_ENDHDR_2; 1368 s->state = BZ_X_ENDHDR_2;
1369 if (get_bits(s, &uc, 8) == FALSE) { 1369 if (! get_bits(s, &uc, 8)) {
1370 retVal = BZ_OK; 1370 retVal = BZ_OK;
1371 goto save_state_and_return; 1371 goto save_state_and_return;
1372 } 1372 }
@@ -1377,7 +1377,7 @@ endhdr_2:
1377 1377
1378 case BZ_X_ENDHDR_3: 1378 case BZ_X_ENDHDR_3:
1379 s->state = BZ_X_ENDHDR_3; 1379 s->state = BZ_X_ENDHDR_3;
1380 if (get_bits(s, &uc, 8) == FALSE) { 1380 if (! get_bits(s, &uc, 8)) {
1381 retVal = BZ_OK; 1381 retVal = BZ_OK;
1382 goto save_state_and_return; 1382 goto save_state_and_return;
1383 } 1383 }
@@ -1388,7 +1388,7 @@ endhdr_2:
1388 1388
1389 case BZ_X_ENDHDR_4: 1389 case BZ_X_ENDHDR_4:
1390 s->state = BZ_X_ENDHDR_4; 1390 s->state = BZ_X_ENDHDR_4;
1391 if (get_bits(s, &uc, 8) == FALSE) { 1391 if (! get_bits(s, &uc, 8)) {
1392 retVal = BZ_OK; 1392 retVal = BZ_OK;
1393 goto save_state_and_return; 1393 goto save_state_and_return;
1394 } 1394 }
@@ -1399,7 +1399,7 @@ endhdr_2:
1399 1399
1400 case BZ_X_ENDHDR_5: 1400 case BZ_X_ENDHDR_5:
1401 s->state = BZ_X_ENDHDR_5; 1401 s->state = BZ_X_ENDHDR_5;
1402 if (get_bits(s, &uc, 8) == FALSE) { 1402 if (! get_bits(s, &uc, 8)) {
1403 retVal = BZ_OK; 1403 retVal = BZ_OK;
1404 goto save_state_and_return; 1404 goto save_state_and_return;
1405 } 1405 }
@@ -1410,7 +1410,7 @@ endhdr_2:
1410 1410
1411 case BZ_X_ENDHDR_6: 1411 case BZ_X_ENDHDR_6:
1412 s->state = BZ_X_ENDHDR_6; 1412 s->state = BZ_X_ENDHDR_6;
1413 if (get_bits(s, &uc, 8) == FALSE) { 1413 if (! get_bits(s, &uc, 8)) {
1414 retVal = BZ_OK; 1414 retVal = BZ_OK;
1415 goto save_state_and_return; 1415 goto save_state_and_return;
1416 } 1416 }
@@ -1422,14 +1422,14 @@ endhdr_2:
1422 1422
1423 case BZ_X_CCRC_1: 1423 case BZ_X_CCRC_1:
1424 s->state = BZ_X_CCRC_1; 1424 s->state = BZ_X_CCRC_1;
1425 if (get_bits(s, &uc, 8) == FALSE) { 1425 if (! get_bits(s, &uc, 8)) {
1426 retVal = BZ_OK; 1426 retVal = BZ_OK;
1427 goto save_state_and_return; 1427 goto save_state_and_return;
1428 } 1428 }
1429 s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((unsigned int)uc); 1429 s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((unsigned int)uc);
1430 case BZ_X_CCRC_2: 1430 case BZ_X_CCRC_2:
1431 s->state = BZ_X_CCRC_2; 1431 s->state = BZ_X_CCRC_2;
1432 if (get_bits(s, &uc, 8) == FALSE) { 1432 if (! get_bits(s, &uc, 8)) {
1433 retVal = BZ_OK; 1433 retVal = BZ_OK;
1434 goto save_state_and_return; 1434 goto save_state_and_return;
1435 } 1435 }
@@ -1437,7 +1437,7 @@ endhdr_2:
1437 1437
1438 case BZ_X_CCRC_3: 1438 case BZ_X_CCRC_3:
1439 s->state = BZ_X_CCRC_3; 1439 s->state = BZ_X_CCRC_3;
1440 if (get_bits(s, &uc, 8) == FALSE) { 1440 if (! get_bits(s, &uc, 8)) {
1441 retVal = BZ_OK; 1441 retVal = BZ_OK;
1442 goto save_state_and_return; 1442 goto save_state_and_return;
1443 } 1443 }
@@ -1445,7 +1445,7 @@ endhdr_2:
1445 1445
1446 case BZ_X_CCRC_4: 1446 case BZ_X_CCRC_4:
1447 s->state = BZ_X_CCRC_4; 1447 s->state = BZ_X_CCRC_4;
1448 if (get_bits(s, &uc, 8) == FALSE) { 1448 if (! get_bits(s, &uc, 8)) {
1449 retVal = BZ_OK; 1449 retVal = BZ_OK;
1450 goto save_state_and_return; 1450 goto save_state_and_return;
1451 } 1451 }
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 0ccca8f95..f41363d0f 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -858,7 +858,7 @@ void write_status_file(deb_file_t **deb_file)
858 } 858 }
859 } 859 }
860 /* If the package from the status file wasnt handle above, do it now*/ 860 /* If the package from the status file wasnt handle above, do it now*/
861 if (write_flag == FALSE) { 861 if (! write_flag) {
862 fprintf(new_status_file, "%s\n\n", control_buffer); 862 fprintf(new_status_file, "%s\n\n", control_buffer);
863 } 863 }
864 864
@@ -1206,7 +1206,7 @@ void remove_package(const unsigned int package_num)
1206 exclude_files = create_list(conffile_name); 1206 exclude_files = create_list(conffile_name);
1207 1207
1208 /* Some directories cant be removed straight away, so do multiple passes */ 1208 /* Some directories cant be removed straight away, so do multiple passes */
1209 while (remove_file_array(remove_files, exclude_files) == TRUE); 1209 while (remove_file_array(remove_files, exclude_files));
1210 1210
1211 /* Create a list of all /var/lib/dpkg/info/<package> files */ 1211 /* Create a list of all /var/lib/dpkg/info/<package> files */
1212 remove_files = xmalloc(sizeof(char *) * 11); 1212 remove_files = xmalloc(sizeof(char *) * 11);
@@ -1250,7 +1250,7 @@ void purge_package(const unsigned int package_num)
1250 exclude_files[0] = NULL; 1250 exclude_files[0] = NULL;
1251 1251
1252 /* Some directories cant be removed straight away, so do multiple passes */ 1252 /* Some directories cant be removed straight away, so do multiple passes */
1253 while (remove_file_array(remove_files, exclude_files) == TRUE); 1253 while (remove_file_array(remove_files, exclude_files));
1254 1254
1255 /* Create a list of all /var/lib/dpkg/info/<package> files */ 1255 /* Create a list of all /var/lib/dpkg/info/<package> files */
1256 remove_files = xmalloc(sizeof(char *) * 11); 1256 remove_files = xmalloc(sizeof(char *) * 11);
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 388672541..5fdb0917a 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -171,7 +171,7 @@ extern int gunzip_main(int argc, char **argv)
171 fclose(out_file); 171 fclose(out_file);
172 fclose(in_file); 172 fclose(in_file);
173 173
174 if (delete_old_file == TRUE) { 174 if (delete_old_file) {
175 if (unlink(delete_file_name) < 0) { 175 if (unlink(delete_file_name) < 0) {
176 error_msg_and_die("Couldnt remove %s", delete_file_name); 176 error_msg_and_die("Couldnt remove %s", delete_file_name);
177 } 177 }
diff --git a/archival/libunarchive/unarchive.c b/archival/libunarchive/unarchive.c
index 4a42eaf7d..ff9b5876f 100644
--- a/archival/libunarchive/unarchive.c
+++ b/archival/libunarchive/unarchive.c
@@ -227,7 +227,7 @@ char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers
227 } 227 }
228 } 228 }
229 229
230 if (extract_flag == TRUE) { 230 if (extract_flag) {
231 buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix); 231 buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix);
232 } else { 232 } else {
233 /* seek past the data entry */ 233 /* seek past the data entry */
@@ -238,4 +238,4 @@ char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers
238 free(file_entry); 238 free(file_entry);
239 } 239 }
240 return(buffer); 240 return(buffer);
241} \ No newline at end of file 241}
diff --git a/archival/tar.c b/archival/tar.c
index dd65de131..22cbf3ab2 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -476,9 +476,9 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
476 476
477 /* Read the directory/files and iterate over them one at a time */ 477 /* Read the directory/files and iterate over them one at a time */
478 while (*argv != NULL) { 478 while (*argv != NULL) {
479 if (recursive_action(*argv++, TRUE, FALSE, FALSE, 479 if (! recursive_action(*argv++, TRUE, FALSE, FALSE,
480 writeFileToTarball, writeFileToTarball, 480 writeFileToTarball, writeFileToTarball,
481 (void*) &tbInfo) == FALSE) { 481 (void*) &tbInfo)) {
482 errorFlag = TRUE; 482 errorFlag = TRUE;
483 } 483 }
484 } 484 }
@@ -494,7 +494,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
494 494
495 /* Hang up the tools, close up shop, head home */ 495 /* Hang up the tools, close up shop, head home */
496 close(tarFd); 496 close(tarFd);
497 if (errorFlag == TRUE) { 497 if (errorFlag) {
498 error_msg("Error exit delayed from previous errors"); 498 error_msg("Error exit delayed from previous errors");
499 freeHardLinkInfo(&tbInfo.hlInfoHead); 499 freeHardLinkInfo(&tbInfo.hlInfoHead);
500 return(FALSE); 500 return(FALSE);
@@ -556,7 +556,7 @@ char **list_and_not_list(char **include_list, char **exclude_list)
556 exclude_count++; 556 exclude_count++;
557 } 557 }
558 558
559 if (found == FALSE) { 559 if (! found) {
560 new_include_list = realloc(new_include_list, sizeof(char *) * (include_count + 2)); 560 new_include_list = realloc(new_include_list, sizeof(char *) * (include_count + 2));
561 new_include_list[new_include_count] = include_list[include_count]; 561 new_include_list[new_include_count] = include_list[include_count];
562 new_include_count++; 562 new_include_count++;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-30 18:00:22 +0000