From 5191e1cb38d24ebf5c180ac7911893ca8bc4031f Mon Sep 17 00:00:00 2001 From: fatbob313 Date: Wed, 6 Jan 2010 17:12:14 +0000 Subject: [PATCH] Update copyright year. Fix a typo in logging. --- src/Makefile | 3 --- src/channel.c | 4 ++-- src/channel.h | 4 ++-- src/client.c | 4 ++-- src/client.h | 4 ++-- src/conf.c | 4 ++-- src/conf.h | 4 ++-- src/crypt.c | 4 ++-- src/crypt.h | 4 ++-- src/log.c | 6 +++--- src/log.h | 4 ++-- src/main.c | 4 ++-- src/messagehandler.c | 4 ++-- src/messagehandler.h | 4 ++-- src/messages.c | 4 ++-- src/messages.h | 4 ++-- src/pds.c | 4 ++-- src/pds.h | 4 ++-- src/server.c | 4 ++-- src/server.h | 4 ++-- src/ssl.c | 4 ++-- src/ssl.h | 4 ++-- src/timer.c | 4 ++-- src/timer.h | 4 ++-- 24 files changed, 47 insertions(+), 50 deletions(-) diff --git a/src/Makefile b/src/Makefile index 090f81b..9b959ab 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,3 @@ -# build helloworld executable when user executes "make" - SRCS:=client.c main.c messages.c pds.c server.c ssl.c log.c conf.c crypt.c \ timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c @@ -15,7 +13,6 @@ umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS) google/protobuf-c/libprotobuf_c.a: $(MAKE) -C google/protobuf-c/ -# remove object files and executable when user executes "make clean" clean: $(MAKE) -C google/protobuf-c/ clean rm -f *.o umurmurd diff --git a/src/channel.c b/src/channel.c index 5c562fb..5476b1d 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/channel.h b/src/channel.h index 29c28d3..c889661 100644 --- a/src/channel.h +++ b/src/channel.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/client.c b/src/client.c index 3a7217d..99ebb8c 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/client.h b/src/client.h index 081c99e..b2e4923 100644 --- a/src/client.h +++ b/src/client.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/conf.c b/src/conf.c index 63e209c..4d9a0e6 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/conf.h b/src/conf.h index 3a469b2..5b08c39 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/crypt.c b/src/crypt.c index a7eda57..7d370d0 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/crypt.h b/src/crypt.h index e227ed2..0b35ac3 100644 --- a/src/crypt.h +++ b/src/crypt.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/log.c b/src/log.c index 9dceaad..9eb5981 100644 --- a/src/log.c +++ b/src/log.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. @@ -45,7 +45,7 @@ void Log_init(bool_t terminal) { termprint = terminal; if (!termprint) - openlog("uMurmud", LOG_PID, LOG_DAEMON); + openlog("uMurmurd", LOG_PID, LOG_DAEMON); } void Log_free() diff --git a/src/log.h b/src/log.h index 66a2949..dd32342 100644 --- a/src/log.h +++ b/src/log.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/main.c b/src/main.c index 5139291..d6342f1 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/messagehandler.c b/src/messagehandler.c index 189588e..8b4b94a 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/messagehandler.h b/src/messagehandler.h index cd46cd7..ad11a59 100644 --- a/src/messagehandler.h +++ b/src/messagehandler.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/messages.c b/src/messages.c index f7526c1..ee32f7f 100644 --- a/src/messages.c +++ b/src/messages.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/messages.h b/src/messages.h index eedf7fd..c163c62 100644 --- a/src/messages.h +++ b/src/messages.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/pds.c b/src/pds.c index 5c00abf..3a57954 100644 --- a/src/pds.c +++ b/src/pds.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/pds.h b/src/pds.h index 8985603..d3f1274 100644 --- a/src/pds.h +++ b/src/pds.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/server.c b/src/server.c index d719f37..ff20f81 100644 --- a/src/server.c +++ b/src/server.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/server.h b/src/server.h index aa48482..9fd01b8 100644 --- a/src/server.h +++ b/src/server.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/ssl.c b/src/ssl.c index 09510c0..1ef4892 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/ssl.h b/src/ssl.h index 6c2a8ba..4b8ac33 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/timer.c b/src/timer.c index 53542c1..53a63c9 100644 --- a/src/timer.c +++ b/src/timer.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/timer.h b/src/timer.h index bb7f9bc..e066937 100644 --- a/src/timer.h +++ b/src/timer.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. -- 2.30.2