From 1f0c43668ac332cbcf61cbdf71844799327cc8b9 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 20 Dec 2001 23:13:26 +0000 Subject: Remove `== TRUE' tests and convert `!= TRUE' and `== FALSE' tests to use !. --- archival/bunzip2.c | 88 +++++++++++++++++++-------------------- archival/dpkg.c | 6 +-- archival/gunzip.c | 2 +- archival/libunarchive/unarchive.c | 4 +- archival/tar.c | 8 ++-- 5 files changed, 54 insertions(+), 54 deletions(-) (limited to 'archival') 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) switch (switch_val) { case BZ_X_MAGIC_1: s->state = BZ_X_MAGIC_1; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -637,7 +637,7 @@ int BZ2_decompress(DState *s) case BZ_X_MAGIC_2: s->state = BZ_X_MAGIC_2; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -648,7 +648,7 @@ int BZ2_decompress(DState *s) case BZ_X_MAGIC_3: s->state = BZ_X_MAGIC_3; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -659,7 +659,7 @@ int BZ2_decompress(DState *s) case BZ_X_MAGIC_4: s->state = BZ_X_MAGIC_4; - if (get_bits(s, &s->blockSize100k, 8) == FALSE) { + if (! get_bits(s, &s->blockSize100k, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -687,7 +687,7 @@ int BZ2_decompress(DState *s) case BZ_X_BLKHDR_1: s->state = BZ_X_BLKHDR_1; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -702,7 +702,7 @@ int BZ2_decompress(DState *s) case BZ_X_BLKHDR_2: s->state = BZ_X_BLKHDR_2; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -713,7 +713,7 @@ int BZ2_decompress(DState *s) case BZ_X_BLKHDR_3: s->state = BZ_X_BLKHDR_3; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -724,7 +724,7 @@ int BZ2_decompress(DState *s) case BZ_X_BLKHDR_4: s->state = BZ_X_BLKHDR_4; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -735,7 +735,7 @@ int BZ2_decompress(DState *s) case BZ_X_BLKHDR_5: s->state = BZ_X_BLKHDR_5; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -746,7 +746,7 @@ int BZ2_decompress(DState *s) case BZ_X_BLKHDR_6: s->state = BZ_X_BLKHDR_6; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -763,7 +763,7 @@ int BZ2_decompress(DState *s) case BZ_X_BCRC_1: s->state = BZ_X_BCRC_1; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -771,7 +771,7 @@ int BZ2_decompress(DState *s) case BZ_X_BCRC_2: s->state = BZ_X_BCRC_2; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -779,7 +779,7 @@ int BZ2_decompress(DState *s) case BZ_X_BCRC_3: s->state = BZ_X_BCRC_3; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -787,7 +787,7 @@ int BZ2_decompress(DState *s) case BZ_X_BCRC_4: s->state = BZ_X_BCRC_4; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -799,7 +799,7 @@ int BZ2_decompress(DState *s) int tmp = s->blockRandomised; const int ret = get_bits(s, &tmp, 1); s->blockRandomised = tmp; - if (ret == FALSE) { + if (! ret) { retVal = BZ_OK; goto save_state_and_return; } @@ -809,7 +809,7 @@ int BZ2_decompress(DState *s) case BZ_X_ORIGPTR_1: s->state = BZ_X_ORIGPTR_1; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -817,7 +817,7 @@ int BZ2_decompress(DState *s) case BZ_X_ORIGPTR_2: s->state = BZ_X_ORIGPTR_2; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -825,7 +825,7 @@ int BZ2_decompress(DState *s) case BZ_X_ORIGPTR_3: s->state = BZ_X_ORIGPTR_3; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -844,7 +844,7 @@ int BZ2_decompress(DState *s) case BZ_X_MAPPING_1: for (i = 0; i < 16; i++) { s->state = BZ_X_MAPPING_1; - if (get_bits(s, &uc, 1) == FALSE) { + if (! get_bits(s, &uc, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -864,7 +864,7 @@ int BZ2_decompress(DState *s) for (j = 0; j < 16; j++) { case BZ_X_MAPPING_2: s->state = BZ_X_MAPPING_2; - if (get_bits(s, &uc, 1) == FALSE) { + if (! get_bits(s, &uc, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -891,7 +891,7 @@ int BZ2_decompress(DState *s) /*--- Now the selectors ---*/ case BZ_X_SELECTOR_1: s->state = BZ_X_SELECTOR_1; - if (get_bits(s, &nGroups, 3) == FALSE) { + if (! get_bits(s, &nGroups, 3)) { retVal = BZ_OK; goto save_state_and_return; } @@ -902,7 +902,7 @@ int BZ2_decompress(DState *s) case BZ_X_SELECTOR_2: s->state = BZ_X_SELECTOR_2; - if (get_bits(s, &nSelectors, 15) == FALSE) { + if (! get_bits(s, &nSelectors, 15)) { retVal = BZ_OK; goto save_state_and_return; } @@ -918,7 +918,7 @@ int BZ2_decompress(DState *s) while (1) { case BZ_X_SELECTOR_3: s->state = BZ_X_SELECTOR_3; - if (get_bits(s, &uc, 1) == FALSE) { + if (! get_bits(s, &uc, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -956,7 +956,7 @@ int BZ2_decompress(DState *s) for (t = 0; t < nGroups; t++) { case BZ_X_CODING_1: s->state = BZ_X_CODING_1; - if (get_bits(s, &curr, 5) == FALSE) { + if (! get_bits(s, &curr, 5)) { retVal = BZ_OK; goto save_state_and_return; } @@ -969,7 +969,7 @@ int BZ2_decompress(DState *s) case BZ_X_CODING_2: s->state = BZ_X_CODING_2; - if (get_bits(s, &uc, 1) == FALSE) { + if (! get_bits(s, &uc, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -979,7 +979,7 @@ int BZ2_decompress(DState *s) case BZ_X_CODING_3: s->state = BZ_X_CODING_3; - if (get_bits(s, &uc, 1) == FALSE) { + if (! get_bits(s, &uc, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1044,12 +1044,12 @@ int BZ2_decompress(DState *s) nblock = 0; - if (get_mtf_val_init() == FALSE) { + if (! get_mtf_val_init()) { goto save_state_and_return; } case BZ_X_MTF_1: s->state = BZ_X_MTF_1; - if (get_bits(s, &zvec, zn) == FALSE) { + if (! get_bits(s, &zvec, zn)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1065,7 +1065,7 @@ int BZ2_decompress(DState *s) case BZ_X_MTF_2: s->state = BZ_X_MTF_2; - if (get_bits(s, &zj, 1) == FALSE) { + if (! get_bits(s, &zj, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1094,12 +1094,12 @@ int BZ2_decompress(DState *s) } } N = N * 2; - if (get_mtf_val_init() == FALSE) { + if (! get_mtf_val_init()) { goto save_state_and_return; } case BZ_X_MTF_3: s->state = BZ_X_MTF_3; - if (get_bits(s, &zvec, zn) == FALSE) { + if (! get_bits(s, &zvec, zn)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1115,7 +1115,7 @@ int BZ2_decompress(DState *s) case BZ_X_MTF_4: s->state = BZ_X_MTF_4; - if (get_bits(s, &zj, 1) == FALSE) { + if (! get_bits(s, &zj, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1223,12 +1223,12 @@ int BZ2_decompress(DState *s) } nblock++; - if (get_mtf_val_init() == FALSE) { + if (! get_mtf_val_init()) { goto save_state_and_return; } case BZ_X_MTF_5: s->state = BZ_X_MTF_5; - if (get_bits(s, &zvec, zn) == FALSE) { + if (! get_bits(s, &zvec, zn)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1244,7 +1244,7 @@ int BZ2_decompress(DState *s) case BZ_X_MTF_6: s->state = BZ_X_MTF_6; - if (get_bits(s, &zj, 1) == FALSE) { + if (! get_bits(s, &zj, 1)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1366,7 +1366,7 @@ int BZ2_decompress(DState *s) endhdr_2: case BZ_X_ENDHDR_2: s->state = BZ_X_ENDHDR_2; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1377,7 +1377,7 @@ endhdr_2: case BZ_X_ENDHDR_3: s->state = BZ_X_ENDHDR_3; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1388,7 +1388,7 @@ endhdr_2: case BZ_X_ENDHDR_4: s->state = BZ_X_ENDHDR_4; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1399,7 +1399,7 @@ endhdr_2: case BZ_X_ENDHDR_5: s->state = BZ_X_ENDHDR_5; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1410,7 +1410,7 @@ endhdr_2: case BZ_X_ENDHDR_6: s->state = BZ_X_ENDHDR_6; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1422,14 +1422,14 @@ endhdr_2: case BZ_X_CCRC_1: s->state = BZ_X_CCRC_1; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((unsigned int)uc); case BZ_X_CCRC_2: s->state = BZ_X_CCRC_2; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1437,7 +1437,7 @@ endhdr_2: case BZ_X_CCRC_3: s->state = BZ_X_CCRC_3; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } @@ -1445,7 +1445,7 @@ endhdr_2: case BZ_X_CCRC_4: s->state = BZ_X_CCRC_4; - if (get_bits(s, &uc, 8) == FALSE) { + if (! get_bits(s, &uc, 8)) { retVal = BZ_OK; goto save_state_and_return; } 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) } } /* If the package from the status file wasnt handle above, do it now*/ - if (write_flag == FALSE) { + if (! write_flag) { fprintf(new_status_file, "%s\n\n", control_buffer); } @@ -1206,7 +1206,7 @@ void remove_package(const unsigned int package_num) exclude_files = create_list(conffile_name); /* Some directories cant be removed straight away, so do multiple passes */ - while (remove_file_array(remove_files, exclude_files) == TRUE); + while (remove_file_array(remove_files, exclude_files)); /* Create a list of all /var/lib/dpkg/info/ files */ remove_files = xmalloc(sizeof(char *) * 11); @@ -1250,7 +1250,7 @@ void purge_package(const unsigned int package_num) exclude_files[0] = NULL; /* Some directories cant be removed straight away, so do multiple passes */ - while (remove_file_array(remove_files, exclude_files) == TRUE); + while (remove_file_array(remove_files, exclude_files)); /* Create a list of all /var/lib/dpkg/info/ files */ 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) fclose(out_file); fclose(in_file); - if (delete_old_file == TRUE) { + if (delete_old_file) { if (unlink(delete_file_name) < 0) { error_msg_and_die("Couldnt remove %s", delete_file_name); } 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 } } - if (extract_flag == TRUE) { + if (extract_flag) { buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix); } else { /* seek past the data entry */ @@ -238,4 +238,4 @@ char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers free(file_entry); } return(buffer); -} \ No newline at end of file +} 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, /* Read the directory/files and iterate over them one at a time */ while (*argv != NULL) { - if (recursive_action(*argv++, TRUE, FALSE, FALSE, + if (! recursive_action(*argv++, TRUE, FALSE, FALSE, writeFileToTarball, writeFileToTarball, - (void*) &tbInfo) == FALSE) { + (void*) &tbInfo)) { errorFlag = TRUE; } } @@ -494,7 +494,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv, /* Hang up the tools, close up shop, head home */ close(tarFd); - if (errorFlag == TRUE) { + if (errorFlag) { error_msg("Error exit delayed from previous errors"); freeHardLinkInfo(&tbInfo.hlInfoHead); return(FALSE); @@ -556,7 +556,7 @@ char **list_and_not_list(char **include_list, char **exclude_list) exclude_count++; } - if (found == FALSE) { + if (! found) { new_include_list = realloc(new_include_list, sizeof(char *) * (include_count + 2)); new_include_list[new_include_count] = include_list[include_count]; new_include_count++; -- cgit v1.2.3