The "search.h" header had a couple of issues:
* It was not self containing, as it used size_t without defining it. * It was not C++ safe. * It used the restrict keyword that is not recognized in GCC2. This fixes bug #2262. * It did not contain parameter names as demanded by our coding style. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25818 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
4284d925c6
commit
3b2c863f1c
@ -5,6 +5,10 @@
|
|||||||
#ifndef _SEARCH_H_
|
#ifndef _SEARCH_H_
|
||||||
#define _SEARCH_H_
|
#define _SEARCH_H_
|
||||||
|
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
FIND,
|
FIND,
|
||||||
ENTER
|
ENTER
|
||||||
@ -23,23 +27,30 @@ typedef enum {
|
|||||||
} VISIT;
|
} VISIT;
|
||||||
|
|
||||||
|
|
||||||
extern int hcreate(size_t);
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern int hcreate(size_t elementCount);
|
||||||
extern void hdestroy(void);
|
extern void hdestroy(void);
|
||||||
extern ENTRY *hsearch(ENTRY, ACTION);
|
extern ENTRY *hsearch(ENTRY iteam, ACTION action);
|
||||||
extern void insque(void *, void *);
|
extern void insque(void *element, void *insertAfter);
|
||||||
extern void *lfind(const void *, const void *, size_t *,
|
extern void *lfind(const void *key, const void *base, size_t *_elementCount,
|
||||||
size_t, int (*)(const void *, const void *));
|
size_t width, int (*compareFunction)(const void *, const void *));
|
||||||
extern void *lsearch(const void *, void *, size_t *,
|
extern void *lsearch(const void *key, void *base, size_t *_elementCount,
|
||||||
size_t, int (*)(const void *, const void *));
|
size_t width, int (*compareFunction)(const void *, const void *));
|
||||||
extern void remque(void *);
|
extern void remque(void *element);
|
||||||
extern void *tdelete(const void *restrict, void **restrict,
|
extern void *tdelete(const void *key, void **_root,
|
||||||
int(*)(const void *, const void *));
|
int (*compare)(const void *, const void *));
|
||||||
extern void *tfind(const void *, void *const *,
|
extern void *tfind(const void *key, void *const *root,
|
||||||
int(*)(const void *, const void *));
|
int (*compare)(const void *, const void *));
|
||||||
extern void *tsearch(const void *, void **,
|
extern void *tsearch(const void *key, void **_root,
|
||||||
int(*)(const void *, const void *));
|
int (*compare)(const void *, const void *));
|
||||||
extern void twalk(const void *,
|
extern void twalk(const void *root,
|
||||||
void (*)(const void *, VISIT, int ));
|
void (*action)(const void *, VISIT, int ));
|
||||||
|
|
||||||
#endif /* _SEARCH_H_ */
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* _SEARCH_H_ */
|
||||||
|
Loading…
Reference in New Issue
Block a user