pixman: Branch 'master'

[Søren Sandmann Pedersen]

 CODING_STYLE |   23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 664132128ec430e28dad9f8088a3f6f2a1903f8e
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Wed Aug 4 09:50:30 2010 -0400

    CODING_STYLE: Delete the stuff about trailing spaces
    
    Also fix various other minor issues.

diff --git a/CODING_STYLE b/CODING_STYLE
index 126f1a9..9f5171d 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -19,9 +19,6 @@ not
 
 
 
-Specific guidelines:
-
-
 Indentation
 ===========
 
@@ -93,7 +90,7 @@ or like this:
          * It extends over multiple lines
 	 */
 
-Generally comments should say things that is clear from the code
+Generally comments should say things that aren't clear from the code
 itself. If too many comments say obvious things, then people will just
 stop reading all comments, including the good ones.
 
@@ -152,21 +149,6 @@ Whitespace
 
 	if (condition) foo (); else bar ();	/* Yuck! */
 
-* Do eliminate trailing whitespace (space or tab characters) on any
-  line. Also, avoid putting initial or final blank lines into any
-  file, and never use multiple blank lines instead of a single blank
-  line.
-
-* Do enable the default git pre-commit hook that detect trailing
-  whitespace for you and help you to avoid corrupting cairo's tree
-  with it. Do that as follows:
-
-	chmod a+x .git/hooks/pre-commit
-
-* You might also find the git-stripspace utility helpful which acts as
-  a filter to remove trailing whitespace as well as initial, final,
-  and duplicate blank lines.
-
 
 Function Definitions
 ====================
@@ -174,7 +156,7 @@ Function Definitions
 Function definitions should take the following form:
 
 	void
-	my_function (argument)
+	my_function (int argument)
 	{
 	    do_my_things ();
 	}
@@ -214,3 +196,4 @@ popular editors:
  * vim:sw=4:sts=4:ts=8:tw=78:fo=tcroq:cindent:cino=\:0,(0
  * vim:isk=a-z,A-Z,48-57,_,.,-,>
  */
+