etc/dlist: eliminate dlist.c

dlist.c only contains 2 functions.  Remove it and implement the
functions inline in the header file.  This simplifies the use of
dlist and matches the implementation of linux list.h.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2264 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/etc/user/dlist.c b/etc/user/dlist.c
deleted file mode 100644 (file)
index 5cf9479..0000000
--- a/etc/user/dlist.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*\r
- * Copyright (c) 2009 Intel Corporation. All rights reserved.\r
- *\r
- * This software is available to you under the OpenIB.org BSD license\r
- * below:\r
- *\r
- *     Redistribution and use in source and binary forms, with or\r
- *     without modification, are permitted provided that the following\r
- *     conditions are met:\r
- *\r
- *      - Redistributions of source code must retain the above\r
- *        copyright notice, this list of conditions and the following\r
- *        disclaimer.\r
- *\r
- *      - Redistributions in binary form must reproduce the above\r
- *        copyright notice, this list of conditions and the following\r
- *        disclaimer in the documentation and/or other materials\r
- *        provided with the distribution.\r
- *\r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV\r
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
- * SOFTWARE.\r
- */\r
-\r
-#include <dlist.h>\r
-\r
-void DListInsertAfter(DLIST_ENTRY *pNew, DLIST_ENTRY *pHead)\r
-{\r
-       pNew->Next = pHead->Next;\r
-       pNew->Prev = pHead;\r
-       pHead->Next->Prev = pNew;\r
-       pHead->Next = pNew;\r
-}\r
-\r
-void DListRemove(DLIST_ENTRY *pEntry)\r
-{\r
-       pEntry->Prev->Next = pEntry->Next;\r
-       pEntry->Next->Prev = pEntry->Prev;\r
-}\r

diff --git a/inc/user/dlist.h b/inc/user/dlist.h
index f1cd798..5cf9304 100644 (file)
--- a/inc/user/dlist.h
+++ b/inc/user/dlist.h
@@ -52,7 +52,13 @@ static int DListEmpty(DLIST_ENTRY *pHead)
        return pHead->Next == pHead;\r
 }\r
 \r
-void DListInsertAfter(DLIST_ENTRY *pNew, DLIST_ENTRY *pHead);\r
+static void DListInsertAfter(DLIST_ENTRY *pNew, DLIST_ENTRY *pHead)\r
+{\r
+       pNew->Next = pHead->Next;\r
+       pNew->Prev = pHead;\r
+       pHead->Next->Prev = pNew;\r
+       pHead->Next = pNew;\r
+}\r
 \r
 static void DListInsertBefore(DLIST_ENTRY *pNew, DLIST_ENTRY *pHead)\r
 {\r
@@ -62,7 +68,11 @@ static void DListInsertBefore(DLIST_ENTRY *pNew, DLIST_ENTRY *pHead)
 #define DListInsertHead DListInsertAfter\r
 #define DListInsertTail DListInsertBefore\r
 \r
-void DListRemove(DLIST_ENTRY *pEntry);\r
+static void DListRemove(DLIST_ENTRY *pEntry)\r
+{\r
+       pEntry->Prev->Next = pEntry->Next;\r
+       pEntry->Next->Prev = pEntry->Prev;\r
+}\r
 \r
 #ifdef __cplusplus\r
 }\r

diff --git a/ulp/dapl2/dapl/openib_cma/dapl_ib_util.c b/ulp/dapl2/dapl/openib_cma/dapl_ib_util.c
index bf23d43..f48c1cb 100644 (file)
--- a/ulp/dapl2/dapl/openib_cma/dapl_ib_util.c
+++ b/ulp/dapl2/dapl/openib_cma/dapl_ib_util.c
@@ -56,7 +56,6 @@ struct dapl_llist_entry *g_hca_list;
 
 #if defined(_WIN64) || defined(_WIN32)
 #include "..\..\..\..\..\etc\user\comp_channel.cpp"
-#include "..\..\..\..\..\etc\user\dlist.c"
 #include <rdma\winverbs.h>
 
 struct ibvw_windata windata;

diff --git a/ulp/dapl2/dapl/openib_scm/dapl_ib_cq.c b/ulp/dapl2/dapl/openib_scm/dapl_ib_cq.c
index 2af1889..8a9a2ab 100644 (file)
--- a/ulp/dapl2/dapl/openib_scm/dapl_ib_cq.c
+++ b/ulp/dapl2/dapl/openib_scm/dapl_ib_cq.c
@@ -55,7 +55,6 @@
 
 #if defined(_WIN64) || defined(_WIN32)
 #include "..\..\..\..\..\etc\user\comp_channel.cpp"
-#include "..\..\..\..\..\etc\user\dlist.c"
 
 void dapli_cq_thread_destroy(struct dapl_hca *hca_ptr)
 {

diff --git a/ulp/libibverbs/src/device.cpp b/ulp/libibverbs/src/device.cpp
index 143f8b3..a515a16 100644 (file)
--- a/ulp/libibverbs/src/device.cpp
+++ b/ulp/libibverbs/src/device.cpp
@@ -32,7 +32,6 @@
 #include <infiniband/verbs.h>\r
 #include <rdma/winverbs.h>\r
 #include "..\..\..\etc\user\comp_channel.cpp"\r
-#include "..\..\..\etc\user\dlist.c"\r
 \r
 CRITICAL_SECTION lock;\r
 IWVProvider *prov;\r

diff --git a/ulp/librdmacm/src/cma.cpp b/ulp/librdmacm/src/cma.cpp
index 6f4e5e1..757e4cd 100644 (file)
--- a/ulp/librdmacm/src/cma.cpp
+++ b/ulp/librdmacm/src/cma.cpp
@@ -38,7 +38,6 @@
 #include <iba/ibat.h>\r
 #include "cma.h"\r
 #include "..\..\..\etc\user\comp_channel.cpp"\r
-#include "..\..\..\etc\user\dlist.c"\r
 \r
 static struct ibvw_windata windata;\r
 \r