1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
samba-mirror/ctdb
Amitay Isaacs 3c1f656764 Revert "when creating/adding a public ip, set the initial interface to be the first interface specified"
This reverts commit 4308935ba48ac7a29e7523315acf580019715f0f.

This fixes 16_ctdb_config_add_ip.sh test when run against local daemons. When
running against local daemons, if the interface is assigned as soon as an IP is
added, then takeover would never assign this IP address.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 06dfd13604d08910e07cbf927c338d7b9fce9a2f)
2012-10-07 15:25:34 +11:00
..
client util: ctdb_fork() closes all sockets opened by the main daemon 2012-10-05 11:56:12 +10:00
common util: ctdb_fork() closes all sockets opened by the main daemon 2012-10-05 11:56:12 +10:00
config eventscripts: Auto-start/stop services in background 2012-10-03 08:48:23 +10:00
doc doc: Fix path string of /etc/sysconfig/ctdb file 2012-08-20 17:06:28 +10:00
ib Remove explicit include of lib/tevent/tevent.h. 2012-04-13 17:28:14 +10:00
include libctdb: add ctdb_getcapabilities() 2012-09-28 17:05:34 +10:00
lib tevent: change version to 0.9.16 2012-06-12 15:40:20 +10:00
libctdb libctdb: Add comments to effect that some controls return result in status 2012-10-02 17:37:52 +10:00
packaging Eventscripts: split 50.samba into 49.winbind and 50.samba 2012-10-03 08:46:32 +10:00
server Revert "when creating/adding a public ip, set the initial interface to be the first interface specified" 2012-10-07 15:25:34 +11:00
tcp ctdbd: Log a meaningful message if the nodes file/list is empty 2012-07-26 22:10:54 +10:00
tests eventscripts: Auto-start/stop services in background 2012-10-03 08:48:23 +10:00
tools tools/ctdb: Free the event context 2012-10-02 17:37:53 +10:00
utils Remove explicit include of lib/tevent/tevent.h. 2012-04-13 17:28:14 +10:00
web web: Add my name to the developer list. 2012-07-24 17:27:41 +10:00
.bzrignore more code rearrangement 2007-06-07 22:16:48 +10:00
.gitignore Update .gitignore for eventscript testing fu. 2012-03-22 15:30:27 +11:00
aclocal.m4 initial version 2006-11-18 10:41:20 +11:00
autogen.sh event: Update events to latest Samba version 0.9.8 2010-08-18 09:16:31 +09:30
config.guess Revert "try to restart statd everytime it fails, not just the first time" 2009-09-15 19:33:35 +10:00
config.mk minor back-merge from samba4 2007-07-10 18:13:47 +10:00
config.sub Revert "try to restart statd everytime it fails, not just the first time" 2009-09-15 19:33:35 +10:00
configure.ac Fix the build on freebsd9. (typo in flags?) 2012-02-18 12:35:19 +01:00
configure.rpm fixed permissions on configure.rpm 2008-04-22 16:48:25 +02:00
COPYING add a licence file 2009-02-07 08:10:34 +11:00
ctdb.pc.in (This used to be ctdb commit b0718551f55d5da9be0e6aba233f57c1ff8509be) 2009-04-08 09:14:20 +10:00
install-sh initial version 2006-11-18 10:41:20 +11:00
Makefile.in Eventscripts: split 50.samba into 49.winbind and 50.samba 2012-10-03 08:46:32 +10:00
README.Coding Add a code-style document. 2010-07-30 16:37:22 +10:00

##
## Coding conventions in the Samba 3.0 tree
##

===========
Quick Start
===========

Coding style guidelines are about reducing the number of unnecessary
reformatting patches and making things easier developers to work together.
You don't have to like them or even agree with them, but once put in place
we all have to abide by them (or vote to change them).  However, coding
style should never outweigh coding itself and so the the guidelines
described here are hopefully easier enough to follow as they are very
common and supported by tools and editors.

The basic style, also mentioned in the SAMBA_4_0/prog_guide.txt is the
Linux kernel coding style (See Documentation/CodingStyle in the kernel
source tree).  The closely matches what most Samba developers use already
anyways.

But to save you the trouble of reading the Linux kernel style guide, here
are the highlights.


* Maximum Line Width is 80 Characters
  The reason is not for people with low-res screens but rather sticking
  to 80 columns prevents you from easily nesting more than one level of
  if statements or other code blocks.  Use source/script/count_80_col.pl
  to check your changes.

* Use 8 Space Tabs to Indent
  No whitespace filler.

* No Trailing Whitespace
  Use source/script/strip_trail_ws.pl to clean you files before committing.

* Follow the K&R guidelines.  We won't go throw them all here.  You have
  a copy of "The C Programming Language" anyways right?  You can also use
  the format_indent.sh script found in source/script/ if all else fails.



============
Editor Hints
============

Emacs
-----
Add the follow to your $HOME/.emacs file:

  (add-hook 'c-mode-hook
	(lambda ()
		(c-set-style "linux")
		(c-toggle-auto-state)))


Vi
--
(Thanks to SATOH Fumiyasu <fumiyas@osstech.jp> for these hints):

For the basic vi editor including with all variants of *nix, add the 
following to $HOME/.exrc:

  set tabstop=8
  set shiftwidth=8

For Vim, the following settings in $HOME/.vimrc will also deal with 
displaying trailing whitespace:

  if has("syntax") && (&t_Co > 2 || has("gui_running"))
	syntax on
	function! ActivateInvisibleCharIndicator()
		syntax match TrailingSpace "[ \t]\+$" display containedin=ALL
		highlight TrailingSpace ctermbg=Red
	endf
	autocmd BufNewFile,BufRead * call ActivateInvisibleCharIndicator()
  endif
  " Show tabs, trailing whitespace, and continued lines visually
  set list listchars=tab:»·,trail:·,extends:…

  " highlight overly long lines same as TODOs.
  set textwidth=80
  autocmd BufNewFile,BufRead *.c,*.h exec 'match Todo /\%>' . &textwidth . 'v.\+/'


=========================
FAQ & Statement Reference
=========================

Comments
--------

Comments should always use the standard C syntax.  I.e. /* ... */.  C++ 
style comments are not currently allowed.


Indention & Whitespace & 80 columns
-----------------------------------

To avoid confusion, indentations are to be 8 character with tab (not 
8 ' ' characters.  When wrapping parameters for function calls, 
alignment parameter list with the first parameter on the previous line.
Use tabs to get as close as possible and then fill in the final 7 
characters or less with whitespace.  For example,

	var1 = foo(arg1, arg2,
		   arg3);

The previous example is intended to illustrate alignment of function 
parameters across lines and not as encourage for gratuitous line 
splitting.  Never split a line before columns 70 - 79 unless you
have a really good reason.  Be smart about formatting.


If, switch, & Code blocks
-------------------------

Always follow an 'if' keyword with a space but don't include additional
spaces following or preceding the parentheses in the conditional.
This is good:

	if (x == 1)

This is bad:

	if ( x == 1 )

Yes we have a lot of code that uses the second form and we are trying 
to clean it up without being overly intrusive.

Note that this is a rule about parentheses following keywords and not
functions.  Don't insert a space between the name and left parentheses when 
invoking functions.

Braces for code blocks used by for, if, switch, while, do..while, etc...
should begin on the same line as the statement keyword and end on a line 
of their own.  NOTE: Functions are different and the beginning left brace
should begin on a line of its own.

If the beginning statement has to be broken across lines due to length,
the beginning brace should be on a line of its own.

The exception to the ending rule is when the closing brace is followed by 
another language keyword such as else or the closing while in a do..while 
loop.

Good examples:

	if (x == 1) {
		printf("good\n");
	}

	for (x=1;
	     x<10;
	     x++)
	{
		print("%d\n", x);
	}

	do {
		printf("also good\n");
	} while (1);

Bad examples:

	while (1)
	{
		print("I'm in a loop!\n"); }
	

Goto
----

While many people have been academically taught that goto's are fundamentally
evil, then can greatly enhance readability and reduce memory leaks when used
as the single exit point from a function.  But in no Samba world what so ever 
is a goto outside of a function or block of code a good idea.

Good Examples:

int function foo(int y)
{
	int *z = NULL;
	int ret = 0;

	if ( y < 10 ) {
		z = malloc(sizeof(int)*y);
		if (!z) {
			ret = 1;
			goto done;
		}
	}

	print("Allocated %d elements.\n", y);

 done: 
	if (z)
		free(z);

	return ret;
}


Checking Pointer Values
-----------------------

When invoking functions that return pointer values, either of the following 
are acceptable.  Use you best judgement and choose the more readable option.
Remember that many other people will review it.

	if ((x = malloc(sizeof(short)*10)) == NULL ) {
		fprintf(stderr, "Unable to alloc memory!\n");
	}

or

	x = malloc(sizeof(short)*10);
	if (!x) {
		fprintf(stderr, "Unable to alloc memory!\n");
	}


Primitive Data Types
--------------------

Samba has large amounts of historical code which makes use of data types 
commonly supported by the C99 standard. However, at the time such types 
as boolean and exact width integers did not exist and Samba developers 
were forced to provide their own.  Now that these types are guaranteed to 
be available either as part of the compiler C99 support or from lib/replace/, 
new code should adhere to the following conventions:

  * Booleans are of type "bool" (not BOOL)
  * Boolean values are "true" and "false" (not True or False)
  * Exact width integers are of type [u]int[8|16|32|64]_t