diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2005-10-29 22:36:31 +0000 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2005-10-29 22:36:31 +0000 |
commit | 632a9432774ff3a0c6e556e8f32a565b38890767 (patch) | |
tree | 8b1af8cdef2fe7c84d5c2f5fbe8e3c23d8320bec /sdpd/main.c | |
parent | b5b9479c9afc42666245261d5864f410c59a9ef2 (diff) |
Big cleanup of CVS relics
Diffstat (limited to 'sdpd/main.c')
-rw-r--r-- | sdpd/main.c | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/sdpd/main.c b/sdpd/main.c index 27d2f800..0181657c 100644 --- a/sdpd/main.c +++ b/sdpd/main.c @@ -4,54 +4,49 @@ * * Copyright (C) 2001-2002 Nokia Corporation * Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com> - * Copyright (C) 2002-2004 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2002-2005 Marcel Holtmann <marcel@holtmann.org> * Copyright (C) 2002-2003 Stephen Crane <steve.crane@rococosoft.com> * * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY - * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, - * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS - * SOFTWARE IS DISCLAIMED. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <stdlib.h> -#include <unistd.h> #include <stdio.h> #include <errno.h> +#include <unistd.h> +#include <stdlib.h> #include <signal.h> #include <syslog.h> #include <getopt.h> -#include <sys/un.h> -#include <sys/select.h> #include <sys/stat.h> #include <sys/ioctl.h> #include <sys/socket.h> -#include <netinet/in.h> #include <bluetooth/bluetooth.h> #include <bluetooth/l2cap.h> #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> +#include <sys/un.h> +#include <netinet/in.h> + #include "sdpd.h" static int l2cap_sock, unix_sock; |