From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 14 Aug 2011 17:31:27 +0000 (+0200)
Subject: Minor code-style cleanup
X-Git-Tag: v3.2~178^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=590ec997979f5c6785480ff53b8382f637d27bcd;p=thirdparty%2Fccache.git

Minor code-style cleanup
---

diff --git a/ccache.c b/ccache.c
index c9a30f0b0..bc4d29fba 100644
--- a/ccache.c
+++ b/ccache.c
@@ -653,8 +653,8 @@ to_cache(struct args *args)
 		fd = open(tmp_stderr, O_RDONLY | O_BINARY);
 		if (fd != -1) {
 			if (str_eq(output_obj, "/dev/null")
-			    || (! output_to_real_object_first
-                                && access(tmp_obj, R_OK) == 0
+			    || (!output_to_real_object_first
+			        && access(tmp_obj, R_OK) == 0
 			        && move_file(tmp_obj, output_obj, 0) == 0)
 			    || errno == ENOENT) {
 				/* we can use a quick method of getting the failed output */
@@ -1035,11 +1035,11 @@ calculate_object_hash(struct args *args, struct mdfour *hash, int direct_mode)
 	 * For profile usage (-fprofile-use):
 	 * - hash profile data
 	 *
-	 *  -fbranch-probabilities, -fvpt usage are covered by
-	 *  -fprofile-generate/-fprofile-use
+	 * -fbranch-probabilities and -fvpt usage is covered by
+	 * -fprofile-generate/-fprofile-use.
 	 *
-	 *  The profile directory can be specified as an argument to
-	 *  -fprofile-generate=, -fprofile-use=, or -fprofile-dir
+	 * The profile directory can be specified as an argument to
+	 * -fprofile-generate=, -fprofile-use=, or -fprofile-dir=.
 	 */
 
 	/*
@@ -1606,11 +1606,10 @@ cc_process_args(struct args *orig_args, struct args **preprocessor_args,
 			if (arg_profile_dir) {
 				char* option = x_strndup(argv[i], arg_profile_dir - argv[i]);
 
-				/* convert to absolute path */
+				/* Convert to absolute path. */
 				arg_profile_dir = x_realpath(arg_profile_dir + 1);
 
-				/* We can get a better hit rate by using the
-				 * real path here */
+				/* We can get a better hit rate by using the real path here. */
 				free(arg);
 				arg = format("%s=%s", option, profile_dir);
 				cc_log("Rewriting arg to %s", arg);
@@ -1633,10 +1632,9 @@ cc_process_args(struct args *orig_args, struct args **preprocessor_args,
 				args_add(stripped_args, arg);
 				free(arg);
 
-				/* 
-				 * If the profile directory has already been
-				 * set, give up...hard to know what the user
-				 * means, and what the compiler will do.
+				/*
+				 * If the profile directory has already been set, give up... Hard to
+				 * know what the user means, and what the compiler will do.
 				 */
 				if (arg_profile_dir && profile_dir) {
 					cc_log("Profile directory already set; giving up");