From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 24 Mar 2020 19:58:39 +0000 (+0100)
Subject: Clean up backported commits slightly
X-Git-Tag: v3.7.9~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f0a9c13e21fecab4e75b8f1f04c61563a97c0eb;p=thirdparty%2Fccache.git

Clean up backported commits slightly
---

diff --git a/src/ccache.c b/src/ccache.c
index 32366eaf2..0e66468f2 100644
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -2756,7 +2756,8 @@ cc_process_args(struct args *args,
 		}
 
 		// when using nvcc with separable compilation, -dc implies -c
-		if ((str_eq(argv[i], "-dc") || str_eq(argv[i], "--device-c")) && guessed_compiler == GUESSED_NVCC) {
+		if ((str_eq(argv[i], "-dc") || str_eq(argv[i], "--device-c"))
+		    && guessed_compiler == GUESSED_NVCC) {
 			found_dc_opt = true;
 			continue;
 		}
diff --git a/src/language.c b/src/language.c
index 1dbf96208..f97ca4410 100644
--- a/src/language.c
+++ b/src/language.c
@@ -1,6 +1,4 @@
-// Copyright (C) 2010-2019 Joel Rosdahl and other contributors
-//
-// See doc/AUTHORS.adoc for a complete list of contributors.
+// Copyright (C) 2010-2019 Joel Rosdahl
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/suites/nvcc.bash b/test/suites/nvcc.bash
index 3ee5c3178..c121a5774 100644
--- a/test/suites/nvcc.bash
+++ b/test/suites/nvcc.bash
@@ -127,10 +127,10 @@ nvcc_tests() {
     expect_stat 'files in cache' 3
     $cuobjdump test_cuda.o > test1.dump
     expect_equal_files reference_test3.dump test1.dump
-    
+
     # -------------------------------------------------------------------------
     TEST "Option -dc"
-    
+
     $REAL_NVCC $nvcc_opts_cuda -dc -o reference_test4.o test_cuda.cu
     $cuobjdump reference_test4.o > reference_test4.dump