diff options
author | Tim Riker <tim@rikers.org> | 2006-01-25 03:08:53 +0300 |
---|---|---|
committer | Tim Riker <tim@rikers.org> | 2006-01-25 03:08:53 +0300 |
commit | c1ef7bdd8d002ae0889efcf883d0e1b7faa938d4 (patch) | |
tree | 5f329b7d0c7f20ecced0dc7581a9ba6dc720d965 /archival | |
parent | f64ff682a3d58dbb627e760e6fe1ec21d9ccdf61 (diff) |
just whitespace
Diffstat (limited to 'archival')
-rw-r--r-- | archival/Config.in | 20 | ||||
-rw-r--r-- | archival/ar.c | 4 | ||||
-rw-r--r-- | archival/dpkg.c | 22 | ||||
-rw-r--r-- | archival/gzip.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 6 | ||||
-rw-r--r-- | archival/libunarchive/decompress_unlzma.c | 10 | ||||
-rw-r--r-- | archival/libunarchive/get_header_ar.c | 20 | ||||
-rw-r--r-- | archival/libunarchive/get_header_tar.c | 2 | ||||
-rw-r--r-- | archival/rpm.c | 2 | ||||
-rw-r--r-- | archival/tar.c | 14 | ||||
-rw-r--r-- | archival/unzip.c | 4 |
11 files changed, 53 insertions, 53 deletions
diff --git a/archival/Config.in b/archival/Config.in index e7d5debb0..7810c354d 100644 --- a/archival/Config.in +++ b/archival/Config.in @@ -47,10 +47,10 @@ config CONFIG_BUNZIP2 is generally considerably better than that achieved by more conventional LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors. - + The BusyBox bunzip2 applet is limited to de-compression only. On an x86 system, this applet adds about 11K. - + Unless you have a specific application which requires bunzip2, you should probably say N here. @@ -73,7 +73,7 @@ config CONFIG_DPKG default n help dpkg is a medium-level tool to install, build, remove and manage Debian packages. - + This implementation of dpkg has a number of limitations, you should use the official dpkg if possible. @@ -82,9 +82,9 @@ config CONFIG_DPKG_DEB default n help dpkg-deb packs, unpacks and provides information about Debian archives. - + This implementation of dpkg-deb cannot pack archives. - + Unless you have a specific application which requires dpkg-deb, you should probably say N here. @@ -228,10 +228,10 @@ config CONFIG_UNLZMA compression algorithm, and range coding. Compression is generally considerably better than that achieved by the bzip2 compressors. - + The BusyBox unlzma applet is limited to de-compression only. On an x86 system, this applet adds about 4K. - + Unless you have a specific application which requires unlzma, you should probably say N here. @@ -272,7 +272,7 @@ config CONFIG_FEATURE_DEB_TAR_GZ depends on CONFIG_DPKG || CONFIG_DPKG_DEB help This is the default compression method inside the debian ar file. - + If you want compatibility with standard .deb's you should say yes here. config CONFIG_FEATURE_DEB_TAR_BZ2 @@ -282,7 +282,7 @@ config CONFIG_FEATURE_DEB_TAR_BZ2 help This allows dpkg and dpkg-deb to extract deb's that are compressed internally with bzip2 instead of gzip. - + You only want this if you are creating your own custom debian packages that use an internal control.tar.bz2 or data.tar.bz2. @@ -293,7 +293,7 @@ config CONFIG_FEATURE_DEB_TAR_LZMA help This allows dpkg and dpkg-deb to extract deb's that are compressed internally with lzma instead of gzip. - + You only want this if you are creating your own custom debian packages that use an internal control.tar.lzma or data.tar.lzma. diff --git a/archival/ar.c b/archival/ar.c index 983b5ae2c..05cb231aa 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -61,12 +61,12 @@ extern int ar_main(int argc, char **argv) { archive_handle_t *archive_handle; unsigned long opt; - static const char msg_unsupported_err[] = + static const char msg_unsupported_err[] = "Archive %s not supported. Install binutils 'ar'."; char magic[8]; archive_handle = init_handle(); - + /* Prepend '-' to the first argument if required */ bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt"; opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); diff --git a/archival/dpkg.c b/archival/dpkg.c index 5f9f3a76b..7ed17d711 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -850,7 +850,7 @@ static void write_status_file(deb_file_t **deb_file) } tmp_string += 8; - tmp_string += strspn(tmp_string, " \n\t"); + tmp_string += strspn(tmp_string, " \n\t"); package_name = bb_xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); write_flag = FALSE; tmp_string = strstr(control_buffer, "Status:"); @@ -989,8 +989,8 @@ static int package_satisfies_dependency(int package, int depend_type) return 0; switch (depend_type) { - case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed"); - case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install"); + case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed"); + case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install"); } return 0; } @@ -1078,7 +1078,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) } } i++; - } + } /* Check dependendcies */ @@ -1114,8 +1114,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) * things which are broken but unrelated to the * packages that are currently being installed */ - if (state_status == search_name_hashtable("installed")) - continue; + if (state_status == search_name_hashtable("installed")) + continue; #endif /* This code is tested only for EDGE_DEPENDS, since I @@ -1125,13 +1125,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) for (j = 0; j < package_node->num_of_edges; j++) { const edge_t *package_edge = package_node->edge[j]; unsigned int package_num; - + if ( package_edge->type == EDGE_OR_PRE_DEPENDS || - package_edge->type == EDGE_OR_DEPENDS ) { /* start an EDGE_OR_ list */ + package_edge->type == EDGE_OR_DEPENDS ) { /* start an EDGE_OR_ list */ number_of_alternatives = package_edge->version; root_of_alternatives = package_edge; continue; - } else if ( number_of_alternatives == 0 ) { /* not in the middle of an EDGE_OR_ list */ + } else if ( number_of_alternatives == 0 ) { /* not in the middle of an EDGE_OR_ list */ number_of_alternatives = 1; root_of_alternatives = NULL; } @@ -1329,7 +1329,7 @@ static void free_array(char **array) */ static void list_packages(void) { - int i; + int i; printf(" Name Version\n"); printf("+++-==============-==============\n"); @@ -1715,7 +1715,7 @@ int dpkg_main(int argc, char **argv) if (package_num == -1) { bb_error_msg("Invalid control file in %s", argv[optind]); - optind++; + optind++; continue; } deb_file[deb_count]->package = (unsigned int) package_num; diff --git a/archival/gzip.c b/archival/gzip.c index 3aa077fbd..1f268dd26 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -1031,7 +1031,7 @@ static void fill_window(void) */ #define FLUSH_BLOCK(eof) \ flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ - (char*)NULL, (long)strstart - block_start, (eof)) + (char*)NULL, (long)strstart - block_start, (eof)) /* =========================================================================== * Same as above, but achieves better compression. We use a lazy diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index 597ec85a3..af3731b15 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c @@ -51,9 +51,9 @@ /* Constants for Huffman coding */ #define MAX_GROUPS 6 -#define GROUP_SIZE 50 /* 64 would have been more efficient */ -#define MAX_HUFCODE_BITS 20 /* Longest Huffman code allowed */ -#define MAX_SYMBOLS 258 /* 256 literals + RUNA + RUNB */ +#define GROUP_SIZE 50 /* 64 would have been more efficient */ +#define MAX_HUFCODE_BITS 20 /* Longest Huffman code allowed */ +#define MAX_SYMBOLS 258 /* 256 literals + RUNA + RUNB */ #define SYMBOL_RUNA 0 #define SYMBOL_RUNB 1 diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c index 977cb48d0..62811ddfc 100644 --- a/archival/libunarchive/decompress_unlzma.c +++ b/archival/libunarchive/decompress_unlzma.c @@ -50,9 +50,9 @@ typedef struct { #define LZMA_LEN_CHOICE_2 (LZMA_LEN_CHOICE + 1) #define LZMA_LEN_LOW (LZMA_LEN_CHOICE_2 + 1) #define LZMA_LEN_MID (LZMA_LEN_LOW \ - + (1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_LOW_BITS))) + + (1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_LOW_BITS))) #define LZMA_LEN_HIGH (LZMA_LEN_MID \ - +(1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_MID_BITS))) + +(1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_MID_BITS))) #define LZMA_NUM_LEN_PROBS (LZMA_LEN_HIGH + (1 << LZMA_LEN_NUM_HIGH_BITS)) #define LZMA_NUM_STATES 12 @@ -76,11 +76,11 @@ typedef struct { #define LZMA_IS_REP_G2 (LZMA_IS_REP_G1 + LZMA_NUM_STATES) #define LZMA_IS_REP_0_LONG (LZMA_IS_REP_G2 + LZMA_NUM_STATES) #define LZMA_POS_SLOT (LZMA_IS_REP_0_LONG \ - + (LZMA_NUM_STATES << LZMA_NUM_POS_BITS_MAX)) + + (LZMA_NUM_STATES << LZMA_NUM_POS_BITS_MAX)) #define LZMA_SPEC_POS (LZMA_POS_SLOT \ - +(LZMA_NUM_LEN_TO_POS_STATES << LZMA_NUM_POS_SLOT_BITS)) + +(LZMA_NUM_LEN_TO_POS_STATES << LZMA_NUM_POS_SLOT_BITS)) #define LZMA_ALIGN (LZMA_SPEC_POS \ - + LZMA_NUM_FULL_DISTANCES - LZMA_END_POS_MODEL_INDEX) + + LZMA_NUM_FULL_DISTANCES - LZMA_END_POS_MODEL_INDEX) #define LZMA_LEN_CODER (LZMA_ALIGN + (1 << LZMA_NUM_ALIGN_BITS)) #define LZMA_REP_LEN_CODER (LZMA_LEN_CODER + LZMA_NUM_LEN_PROBS) #define LZMA_LITERAL (LZMA_REP_LEN_CODER + LZMA_NUM_LEN_PROBS) diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c index ebb6f8cbe..e3a71951f 100644 --- a/archival/libunarchive/get_header_ar.c +++ b/archival/libunarchive/get_header_ar.c @@ -26,15 +26,15 @@ extern char get_header_ar(archive_handle_t *archive_handle) file_header_t *typed = archive_handle->file_header; union { char raw[60]; - struct { - char name[16]; - char date[12]; - char uid[6]; - char gid[6]; - char mode[8]; - char size[10]; - char magic[2]; - } formated; + struct { + char name[16]; + char date[12]; + char uid[6]; + char gid[6]; + char mode[8]; + char size[10]; + char magic[2]; + } formated; } ar; #ifdef CONFIG_FEATURE_AR_LONG_FILENAMES static char *ar_long_names; @@ -102,7 +102,7 @@ extern char get_header_ar(archive_handle_t *archive_handle) #endif } else { /* short filenames */ - typed->name = bb_xstrndup(ar.formated.name, 16); + typed->name = bb_xstrndup(ar.formated.name, 16); } typed->name[strcspn(typed->name, " /")] = '\0'; diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 659b75d9b..26dfad55f 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c @@ -20,7 +20,7 @@ * References: * GNU tar and star man pages, * Opengroup's ustar interchange format, - * http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html + * http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html */ #include <stdio.h> diff --git a/archival/rpm.c b/archival/rpm.c index 32d506de0..a80f799a6 100644 --- a/archival/rpm.c +++ b/archival/rpm.c @@ -43,7 +43,7 @@ #define RPM_STRING_ARRAY_TYPE 8 #define RPM_I18NSTRING_TYPE 9 -#define RPMTAG_NAME 1000 +#define RPMTAG_NAME 1000 #define RPMTAG_VERSION 1001 #define RPMTAG_RELEASE 1002 #define RPMTAG_SUMMARY 1004 diff --git a/archival/tar.c b/archival/tar.c index a4b13b5de..ab4d1f266 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -91,7 +91,7 @@ struct HardLinkInfo { struct TarBallInfo { char *fileName; /* File name of the tarball */ int tarFd; /* Open-for-write file descriptor - for the tarball */ + for the tarball */ struct stat statBuf; /* Stat info for the tarball, letting us know the inode and device that the tarball lives, so we can avoid trying @@ -569,7 +569,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle) /* do the decompression, and cleanup */ if (bb_xread_char(archive_handle->src_fd) != 0x1f || - bb_xread_char(archive_handle->src_fd) != 0x9d) + bb_xread_char(archive_handle->src_fd) != 0x9d) { bb_error_msg_and_die("Invalid magic"); } @@ -699,7 +699,7 @@ static const struct option tar_long_options[] = { # ifdef CONFIG_FEATURE_TAR_COMPRESS { "compress", 0, NULL, 'Z' }, # endif - { 0, 0, 0, 0 } + { 0, 0, 0, 0 } }; #else #define tar_long_options 0 @@ -713,7 +713,7 @@ int tar_main(int argc, char **argv) const char *tar_filename = "-"; unsigned long opt; llist_t *excludes = NULL; - + /* Initialise default values */ tar_handle = init_handle(); tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; @@ -743,7 +743,7 @@ int tar_main(int argc, char **argv) } if((opt & CTX_EXTRACT) && tar_handle->action_data != data_extract_to_stdout) tar_handle->action_data = data_extract_all; - + if (opt & TAR_OPT_2STDOUT) tar_handle->action_data = data_extract_to_stdout; @@ -843,9 +843,9 @@ int tar_main(int argc, char **argv) int zipMode = 0; if (ENABLE_FEATURE_TAR_GZIP && get_header_ptr == get_header_tar_gz) - zipMode = 1; + zipMode = 1; if (ENABLE_FEATURE_TAR_BZIP2 && get_header_ptr == get_header_tar_bz2) - zipMode = 2; + zipMode = 2; if ((tar_handle->action_header == header_list) || (tar_handle->action_header == header_verbose_list)) diff --git a/archival/unzip.c b/archival/unzip.c index caac716cc..f602db12d 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -66,8 +66,8 @@ typedef union { unsigned short method; /* 4-5 */ unsigned short modtime; /* 6-7 */ unsigned short moddate; /* 8-9 */ - unsigned int crc32 ATTRIBUTE_PACKED; /* 10-13 */ - unsigned int cmpsize ATTRIBUTE_PACKED; /* 14-17 */ + unsigned int crc32 ATTRIBUTE_PACKED; /* 10-13 */ + unsigned int cmpsize ATTRIBUTE_PACKED; /* 14-17 */ unsigned int ucmpsize ATTRIBUTE_PACKED; /* 18-21 */ unsigned short filename_len; /* 22-23 */ unsigned short extra_len; /* 24-25 */ |