[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 54/156: tsearch.{h,c}: updated to the latest fixed versi
From: |
gnunet |
Subject: |
[libmicrohttpd] 54/156: tsearch.{h,c}: updated to the latest fixed version |
Date: |
Sun, 28 May 2023 17:51:47 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to tag v0.9.77
in repository libmicrohttpd.
commit 499ff1087ceebbb55ec04fbcfb269c73e45d9a76
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Thu Mar 2 22:23:08 2023 +0300
tsearch.{h,c}: updated to the latest fixed version
Minor modification added to avoid compiler warnings
---
src/microhttpd/tsearch.c | 86 ++++++++++++++++++++----------------------------
src/microhttpd/tsearch.h | 31 +++++++----------
2 files changed, 47 insertions(+), 70 deletions(-)
diff --git a/src/microhttpd/tsearch.c b/src/microhttpd/tsearch.c
index ba550b7d..af373fc3 100644
--- a/src/microhttpd/tsearch.c
+++ b/src/microhttpd/tsearch.c
@@ -21,119 +21,105 @@
typedef struct node
{
- const void *key;
- struct node *llink;
- struct node *rlink;
+ const void *key;
+ struct node *llink, *rlink;
} node_t;
-/* $NetBSD: tsearch.c,v 1.5 2005/11/29 03:12:00 christos Exp $ */
+/* $NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $ */
/* find or insert datum into search tree */
void *
-tsearch (const void *vkey, /* key to be located */
- void **vrootp, /* address of tree root */
+tsearch (const void *vkey, void **vrootp,
int (*compar)(const void *, const void *))
{
node_t *q;
node_t **rootp = (node_t **) vrootp;
- if (NULL == rootp)
+ if (rootp == NULL)
return NULL;
- while (*rootp != NULL)
- { /* Knuth's T1: */
+ while (*rootp != NULL) /* Knuth's T1: */
+ {
int r;
if ((r = (*compar)(vkey, (*rootp)->key)) == 0) /* T2: */
return *rootp; /* we found it! */
rootp = (r < 0) ?
- &(*rootp)->llink : /* T3: follow left branch */
- &(*rootp)->rlink; /* T4: follow right branch */
+ &(*rootp)->llink : /* T3: follow left branch */
+ &(*rootp)->rlink; /* T4: follow right branch */
}
q = malloc (sizeof(node_t)); /* T5: key not found */
- if (q)
- { /* make new node */
+ if (q != NULL) /* make new node */
+ {
*rootp = q; /* link new node to old */
- q->key = vkey; /* initialize new node */
+ q->key = vkey; /* initialize new node */
q->llink = q->rlink = NULL;
}
return q;
}
-/* $NetBSD: tfind.c,v 1.5 2005/03/23 08:16:53 kleink Exp $ */
-/* find a node, or return NULL */
+/* $NetBSD: tfind.c,v 1.7 2012/06/25 22:32:45 abs Exp $ */
+/* find a node by key "vkey" in tree "vrootp", or return 0 */
void *
-tfind (const void *vkey, /* key to be found */
- void *const *vrootp, /* address of the tree root */
+tfind (const void *vkey, void * const *vrootp,
int (*compar)(const void *, const void *))
{
- node_t *const *rootp = (node_t *const*) vrootp;
+ node_t * const *rootp = (node_t * const *) vrootp;
- if (NULL == rootp)
+ if (rootp == NULL)
return NULL;
- while (*rootp != NULL)
- { /* T1: */
+ while (*rootp != NULL) /* T1: */
+ {
int r;
if ((r = (*compar)(vkey, (*rootp)->key)) == 0) /* T2: */
return *rootp; /* key found */
rootp = (r < 0) ?
- &(*rootp)->llink : /* T3: follow left branch */
- &(*rootp)->rlink; /* T4: follow right branch */
+ &(*rootp)->llink : /* T3: follow left branch */
+ &(*rootp)->rlink; /* T4: follow right branch
*/
}
return NULL;
}
-/* $NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ */
-/*
- * delete node with given key
- *
- * vkey: key to be deleted
- * vrootp: address of the root of the tree
- * compar: function to carry out node comparisons
- */
+/* $NetBSD: tdelete.c,v 1.8 2016/01/20 20:47:41 christos Exp $ */
+/* find a node with key "vkey" in tree "vrootp" */
void *
-tdelete (const void *__restrict vkey,
- void **__restrict vrootp,
+tdelete (const void *vkey, void **vrootp,
int (*compar)(const void *, const void *))
{
node_t **rootp = (node_t **) vrootp;
- node_t *p;
- node_t *q;
- node_t *r;
+ node_t *p, *q, *r;
int cmp;
- if ((rootp == NULL) || ((p = *rootp) == NULL))
+ if ((rootp == NULL) || ((p = *rootp) == NULL) )
return NULL;
while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0)
{
p = *rootp;
rootp = (cmp < 0) ?
- &(*rootp)->llink : /* follow llink branch */
- &(*rootp)->rlink; /* follow rlink branch */
+ &(*rootp)->llink : /* follow llink branch */
+ &(*rootp)->rlink; /* follow rlink branch */
if (*rootp == NULL)
return NULL; /* key not found */
}
r = (*rootp)->rlink; /* D1: */
if ((q = (*rootp)->llink) == NULL) /* Left NULL? */
- {
q = r;
- }
- else if (r != NULL)
- { /* Right link is NULL? */
- if (r->llink == NULL)
- { /* D2: Find successor */
+ else if (r != NULL) /* Right link is NULL? */
+ {
+ if (r->llink == NULL) /* D2: Find successor */
+ {
r->llink = q;
q = r;
}
- else
- { /* D3: Find NULL link */
+ else /* D3: Find NULL link */
+ {
for (q = r->llink; q->llink != NULL; q = r->llink)
r = q;
r->llink = q->rlink;
@@ -141,8 +127,8 @@ tdelete (const void *__restrict vkey,
q->rlink = (*rootp)->rlink;
}
}
- free (*rootp); /* D4: Free node */
- *rootp = q; /* link parent to new node */
+ free (*rootp); /* D4: Free node */
+ *rootp = q; /* link parent to new node */
return p;
}
diff --git a/src/microhttpd/tsearch.h b/src/microhttpd/tsearch.h
index 0cfe16a7..c6d873b4 100644
--- a/src/microhttpd/tsearch.h
+++ b/src/microhttpd/tsearch.h
@@ -3,36 +3,27 @@
* Public domain.
*
* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $
- * $FreeBSD: release/9.0.0/include/search.h 105250 2002-10-16 14:29:23Z robert
$
*/
#ifndef _TSEARCH_H_
#define _TSEARCH_H_
-#if defined(__cplusplus)
-extern "C" {
+#ifdef __cplusplus
+extern "C"
+{
#endif /* __cplusplus */
+void *tdelete (const void *, void **,
+ int (*)(const void *, const void *));
-void *
- tdelete (const void *__restrict,
- void **__restrict,
- int (*)(const void *, const void *));
+void *tfind (const void *, void * const *,
+ int (*)(const void *, const void *));
+void *tsearch (const void *, void **,
+ int (*)(const void *, const void *));
-void *
- tfind (const void *,
- void *const *,
- int (*)(const void *, const void *));
-
-
-void *
- tsearch (const void *,
- void **,
- int (*)(const void *, const void *));
-
-#if defined(__cplusplus)
-};
+#ifdef __cplusplus
+}
#endif /* __cplusplus */
#endif /* !_TSEARCH_H_ */
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] 40/156: Added new M4 helper macro, (continued)
- [libmicrohttpd] 40/156: Added new M4 helper macro, gnunet, 2023/05/28
- [libmicrohttpd] 39/156: test_get_iovec: fixed missing include headers, gnunet, 2023/05/28
- [libmicrohttpd] 45/156: MHD_get_version_bin(): added new function, gnunet, 2023/05/28
- [libmicrohttpd] 44/156: add assertion to guard against bad behavior described in #7196, also document that after suspending one must return MHD_YES, gnunet, 2023/05/28
- [libmicrohttpd] 49/156: mhd_check_func.m4: fixed macro, gnunet, 2023/05/28
- [libmicrohttpd] 46/156: mhd_norm_expd.m4: added autoconf helper macro, gnunet, 2023/05/28
- [libmicrohttpd] 55/156: mhd_check_link_run.m4: fixed typo in comment, gnunet, 2023/05/28
- [libmicrohttpd] 48/156: mhd_check_func.m4: fixed overquoting, gnunet, 2023/05/28
- [libmicrohttpd] 47/156: mhd_check_func.m4: fixed English grammar, gnunet, 2023/05/28
- [libmicrohttpd] 51/156: mhd_check_func.m4: added check for function declaration, gnunet, 2023/05/28
- [libmicrohttpd] 54/156: tsearch.{h,c}: updated to the latest fixed version,
gnunet <=
- [libmicrohttpd] 50/156: mhd_check_func.m4: updated, gnunet, 2023/05/28
- [libmicrohttpd] 53/156: mhd_find_lib.m4: fixed compatibility with old autoconf, gnunet, 2023/05/28
- [libmicrohttpd] 52/156: mhd_find_lib.m4: added new autoconf macro, gnunet, 2023/05/28
- [libmicrohttpd] 59/156: configure: fixed some compiler warnings for checks, gnunet, 2023/05/28
- [libmicrohttpd] 58/156: mhd_shutdown_socket_trigger.m4: fixed compiler warning, gnunet, 2023/05/28
- [libmicrohttpd] 61/156: libcurl.m4: patched to fix compiler warning, gnunet, 2023/05/28
- [libmicrohttpd] 60/156: libcurl.m4: updated to the latest version, gnunet, 2023/05/28
- [libmicrohttpd] 63/156: configure: fixed more compiler warnings in log, gnunet, 2023/05/28
- [libmicrohttpd] 56/156: configure: fixed checks for tsearch() and related, gnunet, 2023/05/28
- [libmicrohttpd] 57/156: Makefile: fixed build with 'make' without nested vars support, gnunet, 2023/05/28