From 3316dd5505abaf55fbe6201de8edc248cf62b023 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Sat, 13 Aug 2011 04:06:30 -0400 Subject: [PATCH] remove trailing whitespace --- aes.c | 10 +++++----- liblrzip.c | 8 ++++---- lrzip.c | 2 +- rzip.c | 2 +- stream.c | 8 ++++---- util.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/aes.c b/aes.c index 7dde41b..f10eb79 100644 --- a/aes.c +++ b/aes.c @@ -61,10 +61,10 @@ * Forward S-box & tables */ static unsigned char FSb[256]; -static unsigned long FT0[256]; -static unsigned long FT1[256]; -static unsigned long FT2[256]; -static unsigned long FT3[256]; +static unsigned long FT0[256]; +static unsigned long FT1[256]; +static unsigned long FT2[256]; +static unsigned long FT3[256]; /* * Reverse S-box & tables @@ -501,7 +501,7 @@ int aes_crypt_cbc( aes_context *ctx, { if( padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 ) return( 0 ); - + // If padlock data misaligned, we just fall back to // unaccelerated mode // diff --git a/liblrzip.c b/liblrzip.c index 2e2d00c..4bfd8bb 100644 --- a/liblrzip.c +++ b/liblrzip.c @@ -35,7 +35,7 @@ static bool liblrzip_setup_flags(Lrzip *lr) lr->control->flags |= FLAG_##X##_COMPRESS; \ break - + switch (lr->mode) { case LRZIP_MODE_DECOMPRESS: lr->control->flags |= FLAG_DECOMPRESS; @@ -257,13 +257,13 @@ bool lrzip_file_add(Lrzip *lr, FILE *file) } lr->infiles[lr->infile_idx++] = file; - return true; + return true; } bool lrzip_file_del(Lrzip *lr, FILE *file) { size_t x; - + if ((!lr) || (!file)) return false; if (!lr->infile_buckets) return true; @@ -313,7 +313,7 @@ bool lrzip_filename_add(Lrzip *lr, const char *file) bool lrzip_filename_del(Lrzip *lr, const char *file) { size_t x; - + if ((!lr) || (!file) || (!file[0])) return false; if (!lr->infilename_buckets) return true; diff --git a/lrzip.c b/lrzip.c index 0c3463e..e1569e6 100644 --- a/lrzip.c +++ b/lrzip.c @@ -1148,7 +1148,7 @@ bool compress_file(rzip_control *control) control->fd_out = fd_out; if (!STDIN) if (unlikely(!preserve_perms(control, fd_in, fd_out))) goto error; - } else + } else if (unlikely(!open_tmpoutbuf(control))) goto error; /* Write zeroes to header at beginning of file */ diff --git a/rzip.c b/rzip.c index affabd3..e4a7348 100644 --- a/rzip.c +++ b/rzip.c @@ -725,7 +725,7 @@ static bool mmap_stdin(rzip_control *control, uchar *buf, struct rzip_state *st) buf = (uchar *)mremap(buf, st->chunk_size, total, 0); st->mmap_size = st->chunk_size = total; } else { - /* Empty file */ + /* Empty file */ buf = (uchar *)mremap(buf, st->chunk_size, control->page_size, 0); st->mmap_size = control->page_size; st->chunk_size = 0; diff --git a/stream.c b/stream.c index 2153c27..9fe5cc5 100644 --- a/stream.c +++ b/stream.c @@ -981,7 +981,7 @@ bool close_streamout_threads(rzip_control *control) free(threads); return false; } - + if (++close_thread == control->threads) close_thread = 0; } @@ -1283,7 +1283,7 @@ static bool rewrite_encrypted(rzip_control *control, struct stream_info *sinfo, if (unlikely(write_buf(control, head, SALT_LEN))) failure_goto(("Failed to write_buf head in rewrite_encrypted\n"), error); if (unlikely(read_buf(control, sinfo->fd, buf, 25))) - + failure_goto(("Failed to read_buf buf in rewrite_encrypted\n"), error); if (unlikely(!lrz_encrypt(control, buf, 25, head))) goto error; @@ -1314,7 +1314,7 @@ static void *compthread(void *data) int write_len; /* Make sure this thread doesn't already exist */ - + free(data); cti = &cthread[i]; ctis = cti->sinfo; @@ -1501,7 +1501,7 @@ static bool clear_buffer(rzip_control *control, struct stream_info *sinfo, int s unlock_mutex(control, &cthread[i].mutex); return false; } - + if (newbuf) { /* The stream buffer has been given to the thread, allocate a diff --git a/util.c b/util.c index 58b1fa6..ea3dfb1 100644 --- a/util.c +++ b/util.c @@ -365,7 +365,7 @@ bool lrz_crypt(const rzip_control *control, uchar *buf, i64 len, const uchar *sa if (unlikely(aes_setkey_enc(&aes_ctx, key, 128))) failure_goto(("Failed to aes_setkey_enc in lrz_crypt\n"), error); aes_crypt_cbc(&aes_ctx, AES_ENCRYPT, N, iv, buf, buf); - + if (M) { memset(tmp0, 0, CBC_LEN); memcpy(tmp0, buf + N, M);