obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-10-30 14:35:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.am, coap.h.in: Remove obsolete header t_list.h

Browse Source 
t_list.h has been replaced entirely by utlist.h and thus is not
used anymore. This change removes the last traces.
This commit is contained in:
Olaf Bergmann committed 2016-01-11 18:34:37 +01:00
1 parent 7452d7d50f
commit a6f7fc76fb
3 files changed
+1 -149
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile.am
-1
View File
@@ -90,7 +90,6 @@ libcoap_include_HEADERS = \
include/coap/resource.h \
include/coap/str.h \
include/coap/subscribe.h \
include/coap/t_list.h \
include/coap/uri.h \
include/coap/uthash.h \
include/coap/utlist.h
include/coap/coap.h.in
+1 -2
View File
@@ -1,7 +1,7 @@
/*
* coap.h -- main header file for CoAP stack of libcoap
*
* Copyright (C) 2010-2012,2015 Olaf Bergmann <bergmann@tzi.org>
* Copyright (C) 2010-2012,2015-2016 Olaf Bergmann <bergmann@tzi.org>
* 2015 Carsten Schoenert <c.schoenert@t-online.de>
*
* This file is part of the CoAP library libcoap. Please see README for terms
@@ -48,7 +48,6 @@ extern "C" {
#include "resource.h"
#include "str.h"
#include "subscribe.h"
#include "t_list.h"
#include "uri.h"
#include "uthash.h"
#include "utlist.h"
include/coap/t_list.h
-146
View File
@@ -1,146 +0,0 @@
/*
* t_list -- tinydtls lists
*
* Copyright (C) 2012 Olaf Bergmann <bergmann@tzi.org>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use, copy,
* modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
/**
* @file t_list.h
* @brief Wrappers for list structures and functions
*/
#ifndef _COAP_DTLS_LIST_H_
#define _COAP_DTLS_LIST_H_
#ifndef WITH_CONTIKI
#include "uthash.h"
#include "utlist.h"
/* We define list structures and utility functions to be compatible
* with Contiki list structures. The Contiki list API is part of the
* Contiki operating system, and therefore the following licensing
* terms apply (taken from contiki/core/lib/list.h):
*
* Copyright (c) 2004, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
* $ Id: list.h,v 1.5 2010/09/13 13:31:00 adamdunkels Exp $
*/
typedef void **list_t;
struct list {
struct list *next;
};
#define LIST_CONCAT(s1, s2) s1##s2
#define LIST_STRUCT(name) \
void *LIST_CONCAT(name, _list); \
list_t name
#define LIST_STRUCT_INIT(struct_ptr, name) { \
(struct_ptr)->name = &((struct_ptr)->LIST_CONCAT(name,_list)); \
(struct_ptr)->LIST_CONCAT(name,_list) = NULL; \
}
static inline void *
list_head(list_t the_list) {
return *the_list;
}
static inline void
list_remove(list_t the_list, void *item) {
if (list_head(the_list))
LL_DELETE(*(struct list **)the_list, (struct list *)item);
}
static inline void
list_add(list_t the_list, void *item) {
list_remove(the_list, item);
LL_APPEND(*(struct list **)the_list, (struct list *)item);
}
static inline void
list_push(list_t the_list, void *item) {
LL_PREPEND(*(struct list **)the_list, (struct list *)item);
}
static inline void *
list_pop(list_t the_list) {
struct list *l;
l = (struct list*)*the_list;
if(l)
list_remove(the_list, l);
return l;
}
static inline void
list_insert(list_t the_list, void *previtem, void *newitem) {
if(previtem == NULL) {
list_push(the_list, newitem);
} else {
((struct list *)newitem)->next = ((struct list *)previtem)->next;
((struct list *)previtem)->next = (struct list*)newitem;
}
}
static inline void *
list_item_next(void *item)
{
return item == NULL? NULL: ((struct list *)item)->next;
}
#else /* WITH_CONTIKI */
#include "list.h"
#endif /* WITH_CONTIKI */
#endif /* _COAP_DTLS_LIST_H_ */