d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add the 'restrict' qualifier to match the IEEE Std 1003.1-2001

Browse Source 
prototype of the tdelete(3) function.
 - Remove duplicated space.
 - Use an ANSI-C function definition for tdelete(3).
 - Update the manual page.
This commit is contained in:
robert 2002-08-14 21:16:41 +00:00
parent b9e5cc5c73
commit f1b53f4d95
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/search.h
View File

@ -44,7 +44,8 @@ __BEGIN_DECLS
int hcreate(size_t);
void hdestroy(void);
ENTRY *hsearch(ENTRY, ACTION);
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 **, int (*)(const void *, const void *));
void *tsearch(const void *, void **, int (*)(const void *, const void *));
void twalk(const void *, void (*)(const void *, VISIT, int));

16
lib/libc/stdlib/tdelete.c
View File

@ -25,16 +25,20 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
/* delete node with given key */
/*
* 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
*/
void *
tdelete(vkey, vrootp, compar)
const void *vkey; /* key to be deleted */
void **vrootp; /* address of the root of tree */
int (*compar)(const void *, const void *);
tdelete(const void *__restrict vkey, void **__restrict vrootp,
int (*compar)(const void *, const void *))
{
node_t **rootp = (node_t **)vrootp;
node_t *p, *q, *r;
int cmp;
int cmp;
if (rootp == NULL || (p = *rootp) == NULL)
return NULL;

2
lib/libc/stdlib/tsearch.3
View File

@ -36,7 +36,7 @@
.Sh SYNOPSIS
.In search.h
.Ft void *
.Fn tdelete "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
.Fn tdelete "const void *restrict key" "void **restrict rootp" "int (*compar) (const void *, const void *)"
.Ft void *
.Fn tfind "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
.Ft void *