Changeset d5a89a3 in mainline for uspace/lib/c/include/adt


Ignore:
Timestamp:
2019-02-11T22:31:04Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merging with upstream/master

Location:
uspace/lib/c/include/adt
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/adt/checksum.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_CHECKSUM_H_
    36 #define LIBC_CHECKSUM_H_
     35#ifndef _LIBC_CHECKSUM_H_
     36#define _LIBC_CHECKSUM_H_
    3737
    3838#include <stddef.h>

  • uspace/lib/c/include/adt/circ_buf.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_CIRC_BUF_H_
    36 #define LIBC_CIRC_BUF_H_
     35#ifndef _LIBC_CIRC_BUF_H_
     36#define _LIBC_CIRC_BUF_H_
    3737
    3838#include <errno.h>

  • uspace/lib/c/include/adt/fifo.h

    re3272101 rd5a89a3  
    4343 */
    4444
    45 #ifndef LIBC_FIFO_H_
    46 #define LIBC_FIFO_H_
     45#ifndef _LIBC_FIFO_H_
     46#define _LIBC_FIFO_H_
    4747
    4848#include <stdlib.h>

  • uspace/lib/c/include/adt/gcdlcm.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_GCDLCM_H_
    36 #define LIBC_GCDLCM_H_
     35#ifndef _LIBC_GCDLCM_H_
     36#define _LIBC_GCDLCM_H_
    3737
    3838#include <stddef.h>

  • uspace/lib/c/include/adt/hash.h

    re3272101 rd5a89a3  
    3232/** @file
    3333 */
    34 #ifndef LIBC_ADT_HASH_H_
    35 #define LIBC_ADT_HASH_H_
     34#ifndef _LIBC_ADT_HASH_H_
     35#define _LIBC_ADT_HASH_H_
    3636
    3737#include <stdint.h>

  • uspace/lib/c/include/adt/hash_table.h

    re3272101 rd5a89a3  
    3535 */
    3636
    37 #ifndef LIBC_HASH_TABLE_H_
    38 #define LIBC_HASH_TABLE_H_
     37#ifndef _LIBC_HASH_TABLE_H_
     38#define _LIBC_HASH_TABLE_H_
    3939
    4040#include <adt/list.h>

  • uspace/lib/c/include/adt/list.h

    re3272101 rd5a89a3  
    3434 */
    3535
    36 #ifndef LIBC_LIST_H_
    37 #define LIBC_LIST_H_
     36#ifndef _LIBC_LIST_H_
     37#define _LIBC_LIST_H_
    3838
    3939#include <assert.h>
    … …  
    151151 *
    152152 */
    153 NO_TRACE static inline void link_initialize(link_t *link)
     153_NO_TRACE static inline void link_initialize(link_t *link)
    154154{
    155155        link->prev = NULL;
    … …  
    164164 *
    165165 */
    166 NO_TRACE static inline void list_initialize(list_t *list)
     166_NO_TRACE static inline void list_initialize(list_t *list)
    167167{
    168168        list->head.prev = &list->head;
    … …  
    200200 *
    201201 */
    202 NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
     202_NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
    203203{
    204204        list_insert_after(link, &list->head);
    … …  
    213213 *
    214214 */
    215 NO_TRACE static inline void list_append(link_t *link, list_t *list)
     215_NO_TRACE static inline void list_append(link_t *link, list_t *list)
    216216{
    217217        list_insert_before(link, &list->head);
    … …  
    226226 *
    227227 */
    228 NO_TRACE static inline void list_remove(link_t *link)
     228_NO_TRACE static inline void list_remove(link_t *link)
    229229{
    230230        if ((link->prev != NULL) && (link->next != NULL)) {
    … …  
    243243 *
    244244 */
    245 NO_TRACE static inline bool list_empty(const list_t *list)
     245_NO_TRACE static inline bool list_empty(const list_t *list)
    246246{
    247247        return (list->head.next == &list->head);
    … …  
    311311 *
    312312 */
    313 NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
     313_NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
    314314{
    315315        part1->prev->next = part2;
    … …  
    332332 *
    333333 */
    334 NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
     334_NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
    335335{
    336336        headless_list_split_or_concat(part1, part2);
    … …  
    347347 *
    348348 */
    349 NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
     349_NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
    350350{
    351351        headless_list_split_or_concat(part1, part2);
    … …  
    362362 *
    363363 */
    364 NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
     364_NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
    365365{
    366366        list_splice(list2, list1->head.prev);

  • uspace/lib/c/include/adt/prodcons.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_PRODCONS_H_
    36 #define LIBC_PRODCONS_H_
     35#ifndef _LIBC_PRODCONS_H_
     36#define _LIBC_PRODCONS_H_
    3737
    3838#include <adt/list.h>
Note: See TracChangeset for help on using the changeset viewer.