From 10614a3b974b89b68a0b9d8e5d400d69294f2025 Mon Sep 17 00:00:00 2001 From: "jaehoon.you" Date: Tue, 2 Apr 2013 21:25:35 +0900 Subject: [PATCH] Revert "merge with master" "merge with master" commit changed corrected code. (Prevent 35853) So, I revert to the original state. Reference commit : 6ea6a360fa75766b6e56545486e685ccd552ebab -------------------------------------------------------------------- @@ -1100,7 +1100,7 @@ int test_tar_entry(struct data_src *tardata) return -1; } - if (!(chunksize <= trans_unit_size && chunksize > 0)) { + if ((!chunksize > 0 && chunksize <= trans_unit_size)) { free(chunk); return -1; } ------------------------------------------------------------------- This reverts commit b90e7745cb6da85cbb7958ef9911bfb6c6d7fef6. Change-Id: I1a5d0b11d7ddd73288e4dbf528331c623c99d03a --- LICENSE => LICENSE.APLv2 | 0 NOTICE | 2 +- lthor.c | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) rename LICENSE => LICENSE.APLv2 (100%) diff --git a/LICENSE b/LICENSE.APLv2 similarity index 100% rename from LICENSE rename to LICENSE.APLv2 diff --git a/NOTICE b/NOTICE index ccdad52..0e0f016 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,3 @@ Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. Except as noted, this software is licensed under Apache License, Version 2. -Please, see the LICENSE file for Apache License terms and conditions. +Please, see the LICENSE.APLv2 file for Apache License terms and conditions. diff --git a/lthor.c b/lthor.c index c4937d3..27df43d 100755 --- a/lthor.c +++ b/lthor.c @@ -1100,7 +1100,7 @@ int test_tar_entry(struct data_src *tardata) return -1; } - if ((!chunksize > 0 && chunksize <= trans_unit_size)) { + if (!(chunksize <= trans_unit_size && chunksize > 0)) { free(chunk); return -1; } @@ -1190,7 +1190,8 @@ int main(int argc, char **argv) printf("\n"); printf("Linux Thor downloader, version %s \n", PACKAGE_VERSION); - printf("Authors: YoungJin Lee \n\n"); + printf("Authors: YoungJin Lee , " + "Jaehoon You \n\n"); while (opt < argc) { /* check if we're verbose */ -- 2.34.1