Skip to content
Snippets Groups Projects
Commit 019d1647 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Merge branch 'hotfix-c++' into 'develop' 

...

See merge request !938
parents 73013d6e dfe471fd
No related branches found
No related tags found
1 merge request!938...
Pipeline #21798 failed with stage
Stage: build
    in 5 minutes
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing
    with 8 additions and 3070 deletions
    3rdparty/uthash/src/utarray.h deleted 100644 → 0
    + 0
    − 248
    View file @ 73013d6e
    /*
    Copyright (c) 2008-2022, Troy D. Hanson https://troydhanson.github.io/uthash/
    All rights reserved.
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER
    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.
    */
    /* a dynamic array implementation using macros
    */
    #ifndef UTARRAY_H
    #define UTARRAY_H
    #define UTARRAY_VERSION 2.3.0
    #include <stddef.h> /* size_t */
    #include <string.h> /* memset, etc */
    #include <stdlib.h> /* exit */
    #ifdef __GNUC__
    #define UTARRAY_UNUSED __attribute__((__unused__))
    #else
    #define UTARRAY_UNUSED
    #endif
    #ifdef oom
    #error "The name of macro 'oom' has been changed to 'utarray_oom'. Please update your code."
    #define utarray_oom() oom()
    #endif
    #ifndef utarray_oom
    #define utarray_oom() exit(-1)
    #endif
    typedef void (ctor_f)(void *dst, const void *src);
    typedef void (dtor_f)(void *elt);
    typedef void (init_f)(void *elt);
    typedef struct {
    size_t sz;
    init_f *init;
    ctor_f *copy;
    dtor_f *dtor;
    } UT_icd;
    typedef struct {
    unsigned i,n;/* i: index of next available slot, n: num slots */
    UT_icd icd; /* initializer, copy and destructor functions */
    char *d; /* n slots of size icd->sz*/
    } UT_array;
    #define utarray_init(a,_icd) do { \
    memset(a,0,sizeof(UT_array)); \
    (a)->icd = *(_icd); \
    } while(0)
    #define utarray_done(a) do { \
    if ((a)->n) { \
    if ((a)->icd.dtor) { \
    unsigned _ut_i; \
    for(_ut_i=0; _ut_i < (a)->i; _ut_i++) { \
    (a)->icd.dtor(utarray_eltptr(a,_ut_i)); \
    } \
    } \
    free((a)->d); \
    } \
    (a)->n=0; \
    } while(0)
    #define utarray_new(a,_icd) do { \
    (a) = (UT_array*)malloc(sizeof(UT_array)); \
    if ((a) == NULL) { \
    utarray_oom(); \
    } \
    utarray_init(a,_icd); \
    } while(0)
    #define utarray_free(a) do { \
    utarray_done(a); \
    free(a); \
    } while(0)
    #define utarray_reserve(a,by) do { \
    if (((a)->i+(by)) > (a)->n) { \
    char *utarray_tmp; \
    while (((a)->i+(by)) > (a)->n) { (a)->n = ((a)->n ? (2*(a)->n) : 8); } \
    utarray_tmp=(char*)realloc((a)->d, (a)->n*(a)->icd.sz); \
    if (utarray_tmp == NULL) { \
    utarray_oom(); \
    } \
    (a)->d=utarray_tmp; \
    } \
    } while(0)
    #define utarray_push_back(a,p) do { \
    utarray_reserve(a,1); \
    if ((a)->icd.copy) { (a)->icd.copy( _utarray_eltptr(a,(a)->i++), p); } \
    else { memcpy(_utarray_eltptr(a,(a)->i++), p, (a)->icd.sz); }; \
    } while(0)
    #define utarray_pop_back(a) do { \
    if ((a)->icd.dtor) { (a)->icd.dtor( _utarray_eltptr(a,--((a)->i))); } \
    else { (a)->i--; } \
    } while(0)
    #define utarray_extend_back(a) do { \
    utarray_reserve(a,1); \
    if ((a)->icd.init) { (a)->icd.init(_utarray_eltptr(a,(a)->i)); } \
    else { memset(_utarray_eltptr(a,(a)->i),0,(a)->icd.sz); } \
    (a)->i++; \
    } while(0)
    #define utarray_len(a) ((a)->i)
    #define utarray_eltptr(a,j) (((j) < (a)->i) ? _utarray_eltptr(a,j) : NULL)
    #define _utarray_eltptr(a,j) ((void*)((a)->d + ((a)->icd.sz * (j))))
    #define utarray_insert(a,p,j) do { \
    if ((j) > (a)->i) utarray_resize(a,j); \
    utarray_reserve(a,1); \
    if ((j) < (a)->i) { \
    memmove( _utarray_eltptr(a,(j)+1), _utarray_eltptr(a,j), \
    ((a)->i - (j))*((a)->icd.sz)); \
    } \
    if ((a)->icd.copy) { (a)->icd.copy( _utarray_eltptr(a,j), p); } \
    else { memcpy(_utarray_eltptr(a,j), p, (a)->icd.sz); }; \
    (a)->i++; \
    } while(0)
    #define utarray_inserta(a,w,j) do { \
    if (utarray_len(w) == 0) break; \
    if ((j) > (a)->i) utarray_resize(a,j); \
    utarray_reserve(a,utarray_len(w)); \
    if ((j) < (a)->i) { \
    memmove(_utarray_eltptr(a,(j)+utarray_len(w)), \
    _utarray_eltptr(a,j), \
    ((a)->i - (j))*((a)->icd.sz)); \
    } \
    if ((a)->icd.copy) { \
    unsigned _ut_i; \
    for(_ut_i=0;_ut_i<(w)->i;_ut_i++) { \
    (a)->icd.copy(_utarray_eltptr(a, (j) + _ut_i), _utarray_eltptr(w, _ut_i)); \
    } \
    } else { \
    memcpy(_utarray_eltptr(a,j), _utarray_eltptr(w,0), \
    utarray_len(w)*((a)->icd.sz)); \
    } \
    (a)->i += utarray_len(w); \
    } while(0)
    #define utarray_resize(dst,num) do { \
    unsigned _ut_i; \
    if ((dst)->i > (unsigned)(num)) { \
    if ((dst)->icd.dtor) { \
    for (_ut_i = (num); _ut_i < (dst)->i; ++_ut_i) { \
    (dst)->icd.dtor(_utarray_eltptr(dst, _ut_i)); \
    } \
    } \
    } else if ((dst)->i < (unsigned)(num)) { \
    utarray_reserve(dst, (num) - (dst)->i); \
    if ((dst)->icd.init) { \
    for (_ut_i = (dst)->i; _ut_i < (unsigned)(num); ++_ut_i) { \
    (dst)->icd.init(_utarray_eltptr(dst, _ut_i)); \
    } \
    } else { \
    memset(_utarray_eltptr(dst, (dst)->i), 0, (dst)->icd.sz*((num) - (dst)->i)); \
    } \
    } \
    (dst)->i = (num); \
    } while(0)
    #define utarray_concat(dst,src) do { \
    utarray_inserta(dst, src, utarray_len(dst)); \
    } while(0)
    #define utarray_erase(a,pos,len) do { \
    if ((a)->icd.dtor) { \
    unsigned _ut_i; \
    for (_ut_i = 0; _ut_i < (len); _ut_i++) { \
    (a)->icd.dtor(utarray_eltptr(a, (pos) + _ut_i)); \
    } \
    } \
    if ((a)->i > ((pos) + (len))) { \
    memmove(_utarray_eltptr(a, pos), _utarray_eltptr(a, (pos) + (len)), \
    ((a)->i - ((pos) + (len))) * (a)->icd.sz); \
    } \
    (a)->i -= (len); \
    } while(0)
    #define utarray_renew(a,u) do { \
    if (a) utarray_clear(a); \
    else utarray_new(a, u); \
    } while(0)
    #define utarray_clear(a) do { \
    if ((a)->i > 0) { \
    if ((a)->icd.dtor) { \
    unsigned _ut_i; \
    for(_ut_i=0; _ut_i < (a)->i; _ut_i++) { \
    (a)->icd.dtor(_utarray_eltptr(a, _ut_i)); \
    } \
    } \
    (a)->i = 0; \
    } \
    } while(0)
    #define utarray_sort(a,cmp) do { \
    qsort((a)->d, (a)->i, (a)->icd.sz, cmp); \
    } while(0)
    #define utarray_find(a,v,cmp) bsearch((v),(a)->d,(a)->i,(a)->icd.sz,cmp)
    #define utarray_front(a) (((a)->i) ? (_utarray_eltptr(a,0)) : NULL)
    #define utarray_next(a,e) (((e)==NULL) ? utarray_front(a) : (((a)->i != utarray_eltidx(a,e)+1) ? _utarray_eltptr(a,utarray_eltidx(a,e)+1) : NULL))
    #define utarray_prev(a,e) (((e)==NULL) ? utarray_back(a) : ((utarray_eltidx(a,e) != 0) ? _utarray_eltptr(a,utarray_eltidx(a,e)-1) : NULL))
    #define utarray_back(a) (((a)->i) ? (_utarray_eltptr(a,(a)->i-1)) : NULL)
    #define utarray_eltidx(a,e) (((char*)(e) - (a)->d) / (a)->icd.sz)
    /* last we pre-define a few icd for common utarrays of ints and strings */
    static void utarray_str_cpy(void *dst, const void *src) {
    char *const *srcc = (char *const *)src;
    char **dstc = (char**)dst;
    *dstc = (*srcc == NULL) ? NULL : strdup(*srcc);
    }
    static void utarray_str_dtor(void *elt) {
    char **eltc = (char**)elt;
    if (*eltc != NULL) free(*eltc);
    }
    static const UT_icd ut_str_icd UTARRAY_UNUSED = {sizeof(char*),NULL,utarray_str_cpy,utarray_str_dtor};
    static const UT_icd ut_int_icd UTARRAY_UNUSED = {sizeof(int),NULL,NULL,NULL};
    static const UT_icd ut_ptr_icd UTARRAY_UNUSED = {sizeof(void*),NULL,NULL,NULL};
    #endif /* UTARRAY_H */
    3rdparty/uthash/src/uthash.h deleted 100644 → 0
    + 0
    − 1138
    View file @ 73013d6e
    This diff is collapsed.
    3rdparty/uthash/src/utlist.h deleted 100644 → 0
    + 0
    − 1073
    View file @ 73013d6e
    This diff is collapsed.
    3rdparty/uthash/src/utringbuffer.h deleted 100644 → 0
    + 0
    − 108
    View file @ 73013d6e
    /*
    Copyright (c) 2015-2022, Troy D. Hanson https://troydhanson.github.io/uthash/
    All rights reserved.
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER
    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.
    */
    /* a ring-buffer implementation using macros
    */
    #ifndef UTRINGBUFFER_H
    #define UTRINGBUFFER_H
    #define UTRINGBUFFER_VERSION 2.3.0
    #include <stdlib.h>
    #include <string.h>
    #include "utarray.h" // for "UT_icd"
    typedef struct {
    unsigned i; /* index of next available slot; wraps at n */
    unsigned n; /* capacity */
    unsigned char f; /* full */
    UT_icd icd; /* initializer, copy and destructor functions */
    char *d; /* n slots of size icd->sz */
    } UT_ringbuffer;
    #define utringbuffer_init(a, _n, _icd) do { \
    memset(a, 0, sizeof(UT_ringbuffer)); \
    (a)->icd = *(_icd); \
    (a)->n = (_n); \
    if ((a)->n) { (a)->d = (char*)malloc((a)->n * (_icd)->sz); } \
    } while(0)
    #define utringbuffer_clear(a) do { \
    if ((a)->icd.dtor) { \
    if ((a)->f) { \
    unsigned _ut_i; \
    for (_ut_i = 0; _ut_i < (a)->n; ++_ut_i) { \
    (a)->icd.dtor(utringbuffer_eltptr(a, _ut_i)); \
    } \
    } else { \
    unsigned _ut_i; \
    for (_ut_i = 0; _ut_i < (a)->i; ++_ut_i) { \
    (a)->icd.dtor(utringbuffer_eltptr(a, _ut_i)); \
    } \
    } \
    } \
    (a)->i = 0; \
    (a)->f = 0; \
    } while(0)
    #define utringbuffer_done(a) do { \
    utringbuffer_clear(a); \
    free((a)->d); (a)->d = NULL; \
    (a)->n = 0; \
    } while(0)
    #define utringbuffer_new(a,n,_icd) do { \
    a = (UT_ringbuffer*)malloc(sizeof(UT_ringbuffer)); \
    utringbuffer_init(a, n, _icd); \
    } while(0)
    #define utringbuffer_free(a) do { \
    utringbuffer_done(a); \
    free(a); \
    } while(0)
    #define utringbuffer_push_back(a,p) do { \
    if ((a)->icd.dtor && (a)->f) { (a)->icd.dtor(_utringbuffer_internalptr(a,(a)->i)); } \
    if ((a)->icd.copy) { (a)->icd.copy( _utringbuffer_internalptr(a,(a)->i), p); } \
    else { memcpy(_utringbuffer_internalptr(a,(a)->i), p, (a)->icd.sz); }; \
    if (++(a)->i == (a)->n) { (a)->i = 0; (a)->f = 1; } \
    } while(0)
    #define utringbuffer_len(a) ((a)->f ? (a)->n : (a)->i)
    #define utringbuffer_empty(a) ((a)->i == 0 && !(a)->f)
    #define utringbuffer_full(a) ((a)->f != 0)
    #define _utringbuffer_real_idx(a,j) ((a)->f ? ((j) + (a)->i) % (a)->n : (j))
    #define _utringbuffer_internalptr(a,j) ((void*)((a)->d + ((a)->icd.sz * (j))))
    #define utringbuffer_eltptr(a,j) ((0 <= (j) && (j) < utringbuffer_len(a)) ? _utringbuffer_internalptr(a,_utringbuffer_real_idx(a,j)) : NULL)
    #define _utringbuffer_fake_idx(a,j) ((a)->f ? ((j) + (a)->n - (a)->i) % (a)->n : (j))
    #define _utringbuffer_internalidx(a,e) (((char*)(e) >= (a)->d) ? (((char*)(e) - (a)->d)/(a)->icd.sz) : -1)
    #define utringbuffer_eltidx(a,e) _utringbuffer_fake_idx(a, _utringbuffer_internalidx(a,e))
    #define utringbuffer_front(a) utringbuffer_eltptr(a,0)
    #define utringbuffer_next(a,e) ((e)==NULL ? utringbuffer_front(a) : utringbuffer_eltptr(a, utringbuffer_eltidx(a,e)+1))
    #define utringbuffer_prev(a,e) ((e)==NULL ? utringbuffer_back(a) : utringbuffer_eltptr(a, utringbuffer_eltidx(a,e)-1))
    #define utringbuffer_back(a) (utringbuffer_empty(a) ? NULL : utringbuffer_eltptr(a, utringbuffer_len(a) - 1))
    #endif /* UTRINGBUFFER_H */
    3rdparty/uthash/src/utstack.h deleted 100644 → 0
    + 0
    − 88
    View file @ 73013d6e
    /*
    Copyright (c) 2018-2022, Troy D. Hanson https://troydhanson.github.io/uthash/
    All rights reserved.
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER
    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.
    */
    #ifndef UTSTACK_H
    #define UTSTACK_H
    #define UTSTACK_VERSION 2.3.0
    /*
    * This file contains macros to manipulate a singly-linked list as a stack.
    *
    * To use utstack, your structure must have a "next" pointer.
    *
    * ----------------.EXAMPLE -------------------------
    * struct item {
    * int id;
    * struct item *next;
    * };
    *
    * struct item *stack = NULL;
    *
    * int main() {
    * int count;
    * struct item *tmp;
    * struct item *item = malloc(sizeof *item);
    * item->id = 42;
    * STACK_COUNT(stack, tmp, count); assert(count == 0);
    * STACK_PUSH(stack, item);
    * STACK_COUNT(stack, tmp, count); assert(count == 1);
    * STACK_POP(stack, item);
    * free(item);
    * STACK_COUNT(stack, tmp, count); assert(count == 0);
    * }
    * --------------------------------------------------
    */
    #define STACK_TOP(head) (head)
    #define STACK_EMPTY(head) (!(head))
    #define STACK_PUSH(head,add) \
    STACK_PUSH2(head,add,next)
    #define STACK_PUSH2(head,add,next) \
    do { \
    (add)->next = (head); \
    (head) = (add); \
    } while (0)
    #define STACK_POP(head,result) \
    STACK_POP2(head,result,next)
    #define STACK_POP2(head,result,next) \
    do { \
    (result) = (head); \
    (head) = (head)->next; \
    } while (0)
    #define STACK_COUNT(head,el,counter) \
    STACK_COUNT2(head,el,counter,next) \
    #define STACK_COUNT2(head,el,counter,next) \
    do { \
    (counter) = 0; \
    for ((el) = (head); el; (el) = (el)->next) { ++(counter); } \
    } while (0)
    #endif /* UTSTACK_H */
    3rdparty/uthash/src/utstring.h deleted 100644 → 0
    + 0
    − 407
    View file @ 73013d6e
    /*
    Copyright (c) 2008-2022, Troy D. Hanson https://troydhanson.github.io/uthash/
    All rights reserved.
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER
    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.
    */
    /* a dynamic string implementation using macros
    */
    #ifndef UTSTRING_H
    #define UTSTRING_H
    #define UTSTRING_VERSION 2.3.0
    #include <stdlib.h>
    #include <string.h>
    #include <stdio.h>
    #include <stdarg.h>
    #ifdef __GNUC__
    #define UTSTRING_UNUSED __attribute__((__unused__))
    #else
    #define UTSTRING_UNUSED
    #endif
    #ifdef oom
    #error "The name of macro 'oom' has been changed to 'utstring_oom'. Please update your code."
    #define utstring_oom() oom()
    #endif
    #ifndef utstring_oom
    #define utstring_oom() exit(-1)
    #endif
    typedef struct {
    char *d; /* pointer to allocated buffer */
    size_t n; /* allocated capacity */
    size_t i; /* index of first unused byte */
    } UT_string;
    #define utstring_reserve(s,amt) \
    do { \
    if (((s)->n - (s)->i) < (size_t)(amt)) { \
    char *utstring_tmp = (char*)realloc( \
    (s)->d, (s)->n + (amt)); \
    if (!utstring_tmp) { \
    utstring_oom(); \
    } \
    (s)->d = utstring_tmp; \
    (s)->n += (amt); \
    } \
    } while(0)
    #define utstring_init(s) \
    do { \
    (s)->n = 0; (s)->i = 0; (s)->d = NULL; \
    utstring_reserve(s,100); \
    (s)->d[0] = '\0'; \
    } while(0)
    #define utstring_done(s) \
    do { \
    if ((s)->d != NULL) free((s)->d); \
    (s)->n = 0; \
    } while(0)
    #define utstring_free(s) \
    do { \
    utstring_done(s); \
    free(s); \
    } while(0)
    #define utstring_new(s) \
    do { \
    (s) = (UT_string*)malloc(sizeof(UT_string)); \
    if (!(s)) { \
    utstring_oom(); \
    } \
    utstring_init(s); \
    } while(0)
    #define utstring_renew(s) \
    do { \
    if (s) { \
    utstring_clear(s); \
    } else { \
    utstring_new(s); \
    } \
    } while(0)
    #define utstring_clear(s) \
    do { \
    (s)->i = 0; \
    (s)->d[0] = '\0'; \
    } while(0)
    #define utstring_bincpy(s,b,l) \
    do { \
    utstring_reserve((s),(l)+1); \
    if (l) memcpy(&(s)->d[(s)->i], b, l); \
    (s)->i += (l); \
    (s)->d[(s)->i]='\0'; \
    } while(0)
    #define utstring_concat(dst,src) \
    do { \
    utstring_reserve((dst),((src)->i)+1); \
    if ((src)->i) memcpy(&(dst)->d[(dst)->i], (src)->d, (src)->i); \
    (dst)->i += (src)->i; \
    (dst)->d[(dst)->i]='\0'; \
    } while(0)
    #define utstring_len(s) ((s)->i)
    #define utstring_body(s) ((s)->d)
    UTSTRING_UNUSED static void utstring_printf_va(UT_string *s, const char *fmt, va_list ap) {
    int n;
    va_list cp;
    for (;;) {
    #ifdef _WIN32
    cp = ap;
    #else
    va_copy(cp, ap);
    #endif
    n = vsnprintf (&s->d[s->i], s->n-s->i, fmt, cp);
    va_end(cp);
    if ((n > -1) && ((size_t) n < (s->n-s->i))) {
    s->i += n;
    return;
    }
    /* Else try again with more space. */
    if (n > -1) utstring_reserve(s,n+1); /* exact */
    else utstring_reserve(s,(s->n)*2); /* 2x */
    }
    }
    #ifdef __GNUC__
    /* support printf format checking (2=the format string, 3=start of varargs) */
    static void utstring_printf(UT_string *s, const char *fmt, ...)
    __attribute__ (( format( printf, 2, 3) ));
    #endif
    UTSTRING_UNUSED static void utstring_printf(UT_string *s, const char *fmt, ...) {
    va_list ap;
    va_start(ap,fmt);
    utstring_printf_va(s,fmt,ap);
    va_end(ap);
    }
    /*******************************************************************************
    * begin substring search functions *
    ******************************************************************************/
    /* Build KMP table from left to right. */
    UTSTRING_UNUSED static void _utstring_BuildTable(
    const char *P_Needle,
    size_t P_NeedleLen,
    long *P_KMP_Table)
    {
    long i, j;
    i = 0;
    j = i - 1;
    P_KMP_Table[i] = j;
    while (i < (long) P_NeedleLen)
    {
    while ( (j > -1) && (P_Needle[i] != P_Needle[j]) )
    {
    j = P_KMP_Table[j];
    }
    i++;
    j++;
    if (i < (long) P_NeedleLen)
    {
    if (P_Needle[i] == P_Needle[j])
    {
    P_KMP_Table[i] = P_KMP_Table[j];
    }
    else
    {
    P_KMP_Table[i] = j;
    }
    }
    else
    {
    P_KMP_Table[i] = j;
    }
    }
    return;
    }
    /* Build KMP table from right to left. */
    UTSTRING_UNUSED static void _utstring_BuildTableR(
    const char *P_Needle,
    size_t P_NeedleLen,
    long *P_KMP_Table)
    {
    long i, j;
    i = P_NeedleLen - 1;
    j = i + 1;
    P_KMP_Table[i + 1] = j;
    while (i >= 0)
    {
    while ( (j < (long) P_NeedleLen) && (P_Needle[i] != P_Needle[j]) )
    {
    j = P_KMP_Table[j + 1];
    }
    i--;
    j--;
    if (i >= 0)
    {
    if (P_Needle[i] == P_Needle[j])
    {
    P_KMP_Table[i + 1] = P_KMP_Table[j + 1];
    }
    else
    {
    P_KMP_Table[i + 1] = j;
    }
    }
    else
    {
    P_KMP_Table[i + 1] = j;
    }
    }
    return;
    }
    /* Search data from left to right. ( Multiple search mode. ) */
    UTSTRING_UNUSED static long _utstring_find(
    const char *P_Haystack,
    size_t P_HaystackLen,
    const char *P_Needle,
    size_t P_NeedleLen,
    long *P_KMP_Table)
    {
    long i, j;
    long V_FindPosition = -1;
    /* Search from left to right. */
    i = j = 0;
    while ( (j < (int)P_HaystackLen) && (((P_HaystackLen - j) + i) >= P_NeedleLen) )
    {
    while ( (i > -1) && (P_Needle[i] != P_Haystack[j]) )
    {
    i = P_KMP_Table[i];
    }
    i++;
    j++;
    if (i >= (int)P_NeedleLen)
    {
    /* Found. */
    V_FindPosition = j - i;
    break;
    }
    }
    return V_FindPosition;
    }
    /* Search data from right to left. ( Multiple search mode. ) */
    UTSTRING_UNUSED static long _utstring_findR(
    const char *P_Haystack,
    size_t P_HaystackLen,
    const char *P_Needle,
    size_t P_NeedleLen,
    long *P_KMP_Table)
    {
    long i, j;
    long V_FindPosition = -1;
    /* Search from right to left. */
    j = (P_HaystackLen - 1);
    i = (P_NeedleLen - 1);
    while ( (j >= 0) && (j >= i) )
    {
    while ( (i < (int)P_NeedleLen) && (P_Needle[i] != P_Haystack[j]) )
    {
    i = P_KMP_Table[i + 1];
    }
    i--;
    j--;
    if (i < 0)
    {
    /* Found. */
    V_FindPosition = j + 1;
    break;
    }
    }
    return V_FindPosition;
    }
    /* Search data from left to right. ( One time search mode. ) */
    UTSTRING_UNUSED static long utstring_find(
    UT_string *s,
    long P_StartPosition, /* Start from 0. -1 means last position. */
    const char *P_Needle,
    size_t P_NeedleLen)
    {
    long V_StartPosition;
    long V_HaystackLen;
    long *V_KMP_Table;
    long V_FindPosition = -1;
    if (P_StartPosition < 0)
    {
    V_StartPosition = s->i + P_StartPosition;
    }
    else
    {
    V_StartPosition = P_StartPosition;
    }
    V_HaystackLen = s->i - V_StartPosition;
    if ( (V_HaystackLen >= (long) P_NeedleLen) && (P_NeedleLen > 0) )
    {
    V_KMP_Table = (long *)malloc(sizeof(long) * (P_NeedleLen + 1));
    if (V_KMP_Table != NULL)
    {
    _utstring_BuildTable(P_Needle, P_NeedleLen, V_KMP_Table);
    V_FindPosition = _utstring_find(s->d + V_StartPosition,
    V_HaystackLen,
    P_Needle,
    P_NeedleLen,
    V_KMP_Table);
    if (V_FindPosition >= 0)
    {
    V_FindPosition += V_StartPosition;
    }
    free(V_KMP_Table);
    }
    }
    return V_FindPosition;
    }
    /* Search data from right to left. ( One time search mode. ) */
    UTSTRING_UNUSED static long utstring_findR(
    UT_string *s,
    long P_StartPosition, /* Start from 0. -1 means last position. */
    const char *P_Needle,
    size_t P_NeedleLen)
    {
    long V_StartPosition;
    long V_HaystackLen;
    long *V_KMP_Table;
    long V_FindPosition = -1;
    if (P_StartPosition < 0)
    {
    V_StartPosition = s->i + P_StartPosition;
    }
    else
    {
    V_StartPosition = P_StartPosition;
    }
    V_HaystackLen = V_StartPosition + 1;
    if ( (V_HaystackLen >= (long) P_NeedleLen) && (P_NeedleLen > 0) )
    {
    V_KMP_Table = (long *)malloc(sizeof(long) * (P_NeedleLen + 1));
    if (V_KMP_Table != NULL)
    {
    _utstring_BuildTableR(P_Needle, P_NeedleLen, V_KMP_Table);
    V_FindPosition = _utstring_findR(s->d,
    V_HaystackLen,
    P_Needle,
    P_NeedleLen,
    V_KMP_Table);
    free(V_KMP_Table);
    }
    }
    return V_FindPosition;
    }
    /*******************************************************************************
    * end substring search functions *
    ******************************************************************************/
    #endif /* UTSTRING_H */
    cmake/OS_Detection.cmake
    + 1
    − 1
    View file @ 019d1647
    ......@@ -172,7 +172,7 @@ if(WIN32)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_CCOPT} ")
    set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${_LOPT}")
    include_directories(3rdparty/uthash/src/)
    include_directories(../../dap-sdk/3rdparty/uthash/src/)
    include_directories(3rdparty/wepoll/)
    #include_directories(libdap-chain-net-srv-vpn/)
    endif()
    modules/chain/CMakeLists.txt
    + 1
    − 1
    View file @ 019d1647
    ......@@ -17,4 +17,4 @@ endif()
    target_link_libraries(${PROJECT_NAME} dap_chain_common dap_global_db ${GLIB_LDFLAGS})
    target_include_directories(${PROJECT_NAME} INTERFACE . include/ ${GLIB_INCLUDE_DIRS})
    target_include_directories(${PROJECT_NAME} PUBLIC include)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/uthash/src)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../dap-sdk/3rdparty/uthash/src)
    modules/channel/chain-net/CMakeLists.txt
    + 1
    − 1
    View file @ 019d1647
    ......@@ -11,4 +11,4 @@ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_stream dap_stream_
    target_include_directories(${PROJECT_NAME} INTERFACE .)
    target_include_directories(${PROJECT_NAME} PUBLIC include)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/uthash/src)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../../dap-sdk/3rdparty/uthash/src)
    modules/channel/chain-voting/CMakeLists.txt
    + 1
    − 1
    View file @ 019d1647
    ......@@ -11,4 +11,4 @@ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_stream dap_stream_
    target_include_directories(${PROJECT_NAME} INTERFACE .)
    target_include_directories(${PROJECT_NAME} PUBLIC include)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/uthash/src)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../../dap-sdk/3rdparty/uthash/src)
    modules/channel/chain/CMakeLists.txt
    + 1
    − 1
    View file @ 019d1647
    ......@@ -10,4 +10,4 @@ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_global_d
    target_include_directories(${PROJECT_NAME} INTERFACE .)
    target_include_directories(${PROJECT_NAME} PUBLIC include)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/uthash/src)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../../dap-sdk/3rdparty/uthash/src)
    modules/net/CMakeLists.txt
    + 1
    − 1
    View file @ 019d1647
    ......@@ -53,7 +53,7 @@ endif()
    target_include_directories(${PROJECT_NAME} INTERFACE . )
    target_include_directories(${PROJECT_NAME} PUBLIC include)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/uthash/src)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../dap-sdk/3rdparty/uthash/src)
    if (!WIN32)
    target_include_directories(${PROJECT_NAME} PUBLIC ${IPUTILS_INCLUDE_DIRS})
    ......
    modules/net/srv/CMakeLists.txt
    + 1
    − 1
    View file @ 019d1647
    ......@@ -15,4 +15,4 @@ target_link_libraries(${PROJECT_NAME} ${NET_SRV_LIBS})
    target_include_directories(${PROJECT_NAME} INTERFACE .)
    target_include_directories(${PROJECT_NAME} PUBLIC include)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/uthash/src)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../../dap-sdk/3rdparty/uthash/src)
    modules/type/dag/CMakeLists.txt
    + 1
    − 1
    View file @ 019d1647
    ......@@ -8,4 +8,4 @@ add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_DAG_SRCS} ${DAP_CHAIN_DAG_HEADERS
    target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_net dap_global_db)
    target_include_directories(${PROJECT_NAME} INTERFACE .)
    target_include_directories(${PROJECT_NAME} PUBLIC include)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/uthash/src)
    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../../dap-sdk/3rdparty/uthash/src)
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment