From abe39bb76f7fe897095c5a803685b2a3a9d02ce5 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 23 May 2010 15:07:34 +0000 Subject: K&R coding style should be applied to new code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31194 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/svn-howto.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'DOCS') diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt index 932dad237d..40dd4146f0 100644 --- a/DOCS/tech/svn-howto.txt +++ b/DOCS/tech/svn-howto.txt @@ -261,13 +261,9 @@ II. POLICY / RULES: not apply to files you wrote and/or maintain. -6. We refuse source indentation and other cosmetic changes if they are mixed - with functional changes, such commits will be rejected and removed. Every - developer has his own indentation style, you should not change it. Of course - if you (re)write something, you can use your own style... (Many projects - force a given indentation style - we don't.) If you really need to make - indentation changes (try to avoid this), separate them strictly from real - changes. +6. Do not mix cosmetic changes (indentation, function / variable renaming and + similar) with functional changes in a single commit. Instead, commit such + changes as a separate commit of their own. NOTE: If you had to put if(){ .. } over a large (> 5 lines) chunk of code, do NOT change the indentation of the inner part (don't move it to the right)! @@ -328,6 +324,12 @@ II. POLICY / RULES: with our local changes. +15. Use K&R style with 4 space indentation, no tabs and no trailing whitespace. + Unnecessary braces should be avoided. This policy applies to new files. In + existing files that don't follow K&R style, try to respect the surrounding + style, but in doubt, go for K&R. + + Also read DOCS/tech/patches.txt !!!! We think our rules are not too hard. If you have comments, contact us. -- cgit v1.2.3