K&R style braces

This commit is contained in:
Guus Sliepen 2007-05-18 10:00:00 +00:00
parent 760dd966ef
commit f02d3ed3e1
30 changed files with 233 additions and 466 deletions

View file

@ -47,8 +47,7 @@ sigset_t emptysigset;
static int saved_debug_level = -1;
static void memory_full(int size)
{
static void memory_full(int size) {
logger(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
cp_trace();
exit(1);
@ -170,8 +169,7 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
return NO_ERROR;
}
VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
{
VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
int err = 1;
extern int main2(int argc, char **argv);
@ -229,8 +227,7 @@ bool init_service(void) {
/*
check for an existing tinc for this net, and write pid to pidfile
*/
static bool write_pidfile(void)
{
static bool write_pidfile(void) {
pid_t pid;
cp();
@ -259,8 +256,7 @@ static bool write_pidfile(void)
/*
kill older tincd for this net
*/
bool kill_other(int signal)
{
bool kill_other(int signal) {
#ifndef HAVE_MINGW
pid_t pid;
@ -300,8 +296,7 @@ bool kill_other(int signal)
/*
Detach from current terminal, write pidfile, kill parent
*/
bool detach(void)
{
bool detach(void) {
cp();
setup_signals();
@ -347,8 +342,7 @@ bool detach(void)
return true;
}
bool execute_script(const char *name, char **envp)
{
bool execute_script(const char *name, char **envp) {
#ifdef HAVE_SYSTEM
int status, len;
struct stat s;
@ -431,16 +425,14 @@ bool execute_script(const char *name, char **envp)
*/
#ifndef HAVE_MINGW
static RETSIGTYPE fatal_signal_square(int a)
{
static RETSIGTYPE fatal_signal_square(int a) {
logger(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a,
strsignal(a));
cp_trace();
exit(1);
}
static RETSIGTYPE fatal_signal_handler(int a)
{
static RETSIGTYPE fatal_signal_handler(int a) {
struct sigaction act;
logger(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
cp_trace();
@ -463,14 +455,12 @@ static RETSIGTYPE fatal_signal_handler(int a)
}
}
static RETSIGTYPE unexpected_signal_handler(int a)
{
static RETSIGTYPE unexpected_signal_handler(int a) {
logger(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
cp_trace();
}
static RETSIGTYPE ignore_signal_handler(int a)
{
static RETSIGTYPE ignore_signal_handler(int a) {
ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
}
@ -487,8 +477,7 @@ static struct {
};
#endif
void setup_signals(void)
{
void setup_signals(void) {
#ifndef HAVE_MINGW
int i;
struct sigaction act;