From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Fri, 30 Nov 2007 09:23:51 +0000 (+0100)
Subject: 05_DCCP-Remove-Unused.diff
X-Git-Tag: v0.3.0~73^2~4
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=8d7f47e8cec74e4d209cfa1f6c4c0cec3b0e5019;p=paraslash.git

05_DCCP-Remove-Unused.diff

Since DCCP now also uses the makesock function from net.c, it does no longer
need the functions from dccp.c -- the file is thus removed by this patch.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---

diff --git a/configure.ac b/configure.ac
index 2343053e..73f6fdbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
 all_errlist_objs="server mp3_afh afh_common vss command net string signal time
-daemon stat crypt http_send close_on_fork ipc dccp
+daemon stat crypt http_send close_on_fork ipc
 dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
 playlist sha1 rbtree sched audiod grab_client filter_chain wav compress
 http_recv dccp_recv recv_common write_common file_write audiod_command
@@ -87,7 +87,7 @@ all_executables="server audiod recv filter audioc write client fsck"
 
 recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-	dccp fd sched stdout"
+	fd sched stdout"
 recv_ldflags=""
 
 receivers=" http dccp"
@@ -106,7 +106,7 @@ audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
 	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
 	audiod_command_list"
 audiod_errlist_objs="audiod signal string daemon stat net
-	time grab_client filter_chain wav compress http_recv dccp dccp_recv
+	time grab_client filter_chain wav compress http_recv dccp_recv
 	recv_common fd sched write_common file_write audiod_command crypt
 	client_common"
 audiod_ldflags=""
@@ -115,7 +115,7 @@ audiod_audio_formats=""
 server_cmdline_objs="server.cmdline server_command_list afs_command_list"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
 	time daemon stat crypt http_send close_on_fork
-	ipc dccp dccp_send fd user_list chunk_queue afs osl aft mood score attribute
+	ipc dccp_send fd user_list chunk_queue afs osl aft mood score attribute
 	blob playlist sha1 rbtree sched"
 server_ldflags=""
 server_audio_formats=" mp3"
diff --git a/dccp.c b/dccp.c
deleted file mode 100644
index f5f940a6..00000000
--- a/dccp.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
-
-/** \file dccp.c common functions of the dccp sender/receiver */
-
-/*
- * based on common.c of dccp-cs-0.01.tar.bz2,
- * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
- */
-
-#include <sys/types.h>
-#include <dirent.h>
-
-#include "para.h"
-#include "error.h"
-#include "dccp.h"
-#include "fd.h"
-#include "net.h"
-
-/**
- * obtain a dccp socket for sending/receiving
- *
- * \return the file descriptor of the new socket or \p -E_DCCP_SOCKET
- * on errors.
- */
-int dccp_get_socket(void)
-{
-	int s = socket(AF_INET, SOCK_DCCP, IPPROTO_DCCP);
-
-	if (s < 0)
-		return -E_DCCP_SOCKET;
-	return s;
-}
-
-/**
- * prepare a dccp socket
- *
- * \param fd the file descriptor of the socket
- *
- * \returns positive on success, negative on errors.
- */
-int dccp_set_socket(__a_unused int fd)
-{
-	return 1;	/* nothing to do at the moment */
-}
diff --git a/dccp.h b/dccp.h
deleted file mode 100644
index 0b8fa0ea..00000000
--- a/dccp.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
-
-/** \file dccp.h functions exported by dccp.c */
-
-/*
- * based on common.h of dccp-cs-0.01.tar.bz2,
- * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
- */
-
-int dccp_get_socket(void);
-int dccp_set_socket(int fd);
diff --git a/dccp_recv.c b/dccp_recv.c
index 5329852d..755473c9 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -16,7 +16,6 @@
 
 #include "para.h"
 #include "error.h"
-#include "dccp.h"
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
diff --git a/dccp_send.c b/dccp_send.c
index 0310584d..5d8e6593 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -24,7 +24,6 @@
 #include "list.h"
 #include "vss.h"
 #include "send.h"
-#include "dccp.h"
 #include "fd.h"
 #include "close_on_fork.h"
 #include "chunk_queue.h"