svn commit: trunk/uClibc/libc/misc/search
psm at uclibc.org
psm at uclibc.org
Mon Feb 13 07:19:49 UTC 2006
Author: psm
Date: 2006-02-12 23:19:48 -0800 (Sun, 12 Feb 2006)
New Revision: 13924
Log:
Rename some files, that will conflict w/ IMA
Added:
trunk/uClibc/libc/misc/search/_hsearch_r.c
trunk/uClibc/libc/misc/search/_lsearch.c
trunk/uClibc/libc/misc/search/_tsearch.c
Removed:
trunk/uClibc/libc/misc/search/hsearch_r.c
trunk/uClibc/libc/misc/search/lsearch.c
trunk/uClibc/libc/misc/search/tsearch.c
Modified:
trunk/uClibc/libc/misc/search/Makefile.in
Changeset:
Modified: trunk/uClibc/libc/misc/search/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/search/Makefile.in 2006-02-13 07:10:38 UTC (rev 13923)
+++ trunk/uClibc/libc/misc/search/Makefile.in 2006-02-13 07:19:48 UTC (rev 13924)
@@ -6,16 +6,16 @@
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-MSRC1:=tsearch.c
+MSRC1:=_tsearch.c
MOBJ1:=tsearch.o tfind.o tdelete.o twalk.o tdestroy.o
-MSRC2:=lsearch.c
+MSRC2:=_lsearch.c
MOBJ2:=lfind.o lsearch.o
MSRC3:=insremque.c
MOBJ3:=insque.o remque.o
-MSRC4:=hsearch_r.c
+MSRC4:=_hsearch_r.c
MOBJ4:=hcreate_r.o hdestroy_r.o hsearch_r.o
CSRC:=hsearch.c
Copied: trunk/uClibc/libc/misc/search/_hsearch_r.c (from rev 13920, trunk/uClibc/libc/misc/search/hsearch_r.c)
Copied: trunk/uClibc/libc/misc/search/_lsearch.c (from rev 13920, trunk/uClibc/libc/misc/search/lsearch.c)
Copied: trunk/uClibc/libc/misc/search/_tsearch.c (from rev 13920, trunk/uClibc/libc/misc/search/tsearch.c)
Deleted: trunk/uClibc/libc/misc/search/hsearch_r.c
===================================================================
--- trunk/uClibc/libc/misc/search/hsearch_r.c 2006-02-13 07:10:38 UTC (rev 13923)
+++ trunk/uClibc/libc/misc/search/hsearch_r.c 2006-02-13 07:19:48 UTC (rev 13924)
@@ -1,232 +0,0 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1993.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
-
-#include <search.h>
-
-
-/* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
- [Knuth] The Art of Computer Programming, part 3 (6.4) */
-
-
-/* The reentrant version has no static variables to maintain the state.
- Instead the interface of all functions is extended to take an argument
- which describes the current status. */
-typedef struct _ENTRY
-{
- unsigned int used;
- ENTRY entry;
-}
-_ENTRY;
-
-
-#ifdef L_hcreate_r
-
-/* For the used double hash method the table size has to be a prime. To
- correct the user given table size we need a prime test. This trivial
- algorithm is adequate because
- a) the code is (most probably) called a few times per program run and
- b) the number is small because the table must fit in the core */
-static int isprime (unsigned int number)
-{
- /* no even number will be passed */
- unsigned int div = 3;
-
- while (div * div < number && number % div != 0)
- div += 2;
-
- return number % div != 0;
-}
-
-
-/* Before using the hash table we must allocate memory for it.
- Test for an existing table are done. We allocate one element
- more as the found prime number says. This is done for more effective
- indexing as explained in the comment for the hsearch function.
- The contents of the table is zeroed, especially the field used
- becomes zero. */
-libc_hidden_proto(hcreate_r)
-int hcreate_r (size_t nel, struct hsearch_data *htab)
-{
- /* Test for correct arguments. */
- if (htab == NULL)
- {
- __set_errno (EINVAL);
- return 0;
- }
-
- /* There is still another table active. Return with error. */
- if (htab->table != NULL)
- return 0;
-
- /* Change nel to the first prime number not smaller as nel. */
- nel |= 1; /* make odd */
- while (!isprime (nel))
- nel += 2;
-
- htab->size = nel;
- htab->filled = 0;
-
- /* allocate memory and zero out */
- htab->table = (_ENTRY *) calloc (htab->size + 1, sizeof (_ENTRY));
- if (htab->table == NULL)
- return 0;
-
- /* everything went alright */
- return 1;
-}
-libc_hidden_def(hcreate_r)
-#endif
-
-#ifdef L_hdestroy_r
-/* After using the hash table it has to be destroyed. The used memory can
- be freed and the local static variable can be marked as not used. */
-libc_hidden_proto(hdestroy_r)
-void hdestroy_r (struct hsearch_data *htab)
-{
- /* Test for correct arguments. */
- if (htab == NULL)
- {
- __set_errno (EINVAL);
- return;
- }
-
- if (htab->table != NULL)
- /* free used memory */
- free (htab->table);
-
- /* the sign for an existing table is an value != NULL in htable */
- htab->table = NULL;
-}
-libc_hidden_def(hdestroy_r)
-#endif
-
-#ifdef L_hsearch_r
-/* This is the search function. It uses double hashing with open addressing.
- The argument item.key has to be a pointer to an zero terminated, most
- probably strings of chars. The function for generating a number of the
- strings is simple but fast. It can be replaced by a more complex function
- like ajw (see [Aho,Sethi,Ullman]) if the needs are shown.
-
- We use an trick to speed up the lookup. The table is created by hcreate
- with one more element available. This enables us to use the index zero
- special. This index will never be used because we store the first hash
- index in the field used where zero means not used. Every other value
- means used. The used field can be used as a first fast comparison for
- equality of the stored and the parameter value. This helps to prevent
- unnecessary expensive calls of strcmp. */
-
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strlen)
-
-libc_hidden_proto(hsearch_r)
-int hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
- struct hsearch_data *htab)
-{
- unsigned int hval;
- unsigned int count;
- unsigned int len = strlen (item.key);
- unsigned int idx;
-
- /* Compute an value for the given string. Perhaps use a better method. */
- hval = len;
- count = len;
- while (count-- > 0)
- {
- hval <<= 4;
- hval += item.key[count];
- }
-
- /* First hash function: simply take the modul but prevent zero. */
- hval %= htab->size;
- if (hval == 0)
- ++hval;
-
- /* The first index tried. */
- idx = hval;
-
- if (htab->table[idx].used)
- {
- /* Further action might be required according to the action value. */
- unsigned hval2;
-
- if (htab->table[idx].used == hval
- && strcmp (item.key, htab->table[idx].entry.key) == 0)
- {
- *retval = &htab->table[idx].entry;
- return 1;
- }
-
- /* Second hash function, as suggested in [Knuth] */
- hval2 = 1 + hval % (htab->size - 2);
-
- do
- {
- /* Because SIZE is prime this guarantees to step through all
- available indeces. */
- if (idx <= hval2)
- idx = htab->size + idx - hval2;
- else
- idx -= hval2;
-
- /* If we visited all entries leave the loop unsuccessfully. */
- if (idx == hval)
- break;
-
- /* If entry is found use it. */
- if (htab->table[idx].used == hval
- && strcmp (item.key, htab->table[idx].entry.key) == 0)
- {
- *retval = &htab->table[idx].entry;
- return 1;
- }
- }
- while (htab->table[idx].used);
- }
-
- /* An empty bucket has been found. */
- if (action == ENTER)
- {
- /* If table is full and another entry should be entered return
- with error. */
- if (htab->filled == htab->size)
- {
- __set_errno (ENOMEM);
- *retval = NULL;
- return 0;
- }
-
- htab->table[idx].used = hval;
- htab->table[idx].entry = item;
-
- ++htab->filled;
-
- *retval = &htab->table[idx].entry;
- return 1;
- }
-
- __set_errno (ESRCH);
- *retval = NULL;
- return 0;
-}
-libc_hidden_def(hsearch_r)
-#endif
Deleted: trunk/uClibc/libc/misc/search/lsearch.c
===================================================================
--- trunk/uClibc/libc/misc/search/lsearch.c 2006-02-13 07:10:38 UTC (rev 13923)
+++ trunk/uClibc/libc/misc/search/lsearch.c 2006-02-13 07:19:48 UTC (rev 13924)
@@ -1,51 +0,0 @@
-/*
- * This file lifted in toto from 'Dlibs' on the atari ST (RdeBath)
- *
- *
- * Dale Schumacher 399 Beacon Ave.
- * (alias: Dalnefre') St. Paul, MN 55104
- * dal at syntel.UUCP United States of America
- * "It's not reality that's important, but how you perceive things."
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <search.h>
-
-libc_hidden_proto(lfind)
-
-#ifdef L_lfind
-
-void *lfind(const void *key, const void *base, size_t *nmemb,
- size_t size, int (*compar)(const void *, const void *))
-{
- register int n = *nmemb;
-
- while (n--) {
- if ((*compar) (base, key) == 0)
- return ((void*)base);
- base += size;
- }
- return (NULL);
-}
-libc_hidden_def(lfind)
-
-#endif
-
-#ifdef L_lsearch
-
-libc_hidden_proto(memcpy)
-
-void *lsearch(const void *key, void *base, size_t *nmemb,
- size_t size, int (*compar)(const void *, const void *))
-{
- register char *p;
-
- if ((p = lfind(key, base, nmemb, size, compar)) == NULL) {
- p = memcpy((base + (size * (*nmemb))), key, size);
- ++(*nmemb);
- }
- return (p);
-}
-
-#endif
Deleted: trunk/uClibc/libc/misc/search/tsearch.c
===================================================================
--- trunk/uClibc/libc/misc/search/tsearch.c 2006-02-13 07:10:38 UTC (rev 13923)
+++ trunk/uClibc/libc/misc/search/tsearch.c 2006-02-13 07:19:48 UTC (rev 13924)
@@ -1,223 +0,0 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-/*LINTLIBRARY*/
-
-#include <search.h>
-#include <stdlib.h>
-
-/* This routine is not very bad. It makes many assumptions about
- * the compiler. It assumpts that the first field in node must be
- * the "key" field, which points to the datum. It is a very trick
- * stuff. H.J.
- */
-
-typedef struct node_t
-{
- void *key;
- struct node_t *left, *right;
-} node;
-
-#ifdef L_tsearch
-/* find or insert datum into search tree.
-char *key; key to be located
-register node **rootp; address of tree root
-int (*compar)(); ordering function
-*/
-
-libc_hidden_proto(tsearch)
-void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
-{
- register node *q;
- register node **rootp = (node **) vrootp;
-
- if (rootp == (struct node_t **)0)
- return ((struct node_t *)0);
- while (*rootp != (struct node_t *)0) /* Knuth's T1: */
- {
- int r;
-
- if ((r = (*compar)(key, (*rootp)->key)) == 0) /* T2: */
- return (*rootp); /* we found it! */
- rootp = (r < 0) ?
- &(*rootp)->left : /* T3: follow left branch */
- &(*rootp)->right; /* T4: follow right branch */
- }
- q = (node *) malloc(sizeof(node)); /* T5: key not found */
- if (q != (struct node_t *)0) /* make new node */
- {
- *rootp = q; /* link new node to old */
- q->key = (void *)key; /* initialize new node */
- q->left = q->right = (struct node_t *)0;
- }
- return (q);
-}
-libc_hidden_def(tsearch)
-#endif
-
-#ifdef L_tfind
-libc_hidden_proto(tfind)
-void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar)
-{
- register node **rootp = (node **) vrootp;
-
- if (rootp == (struct node_t **)0)
- return ((struct node_t *)0);
- while (*rootp != (struct node_t *)0) /* Knuth's T1: */
- {
- int r;
-
- if ((r = (*compar)(key, (*rootp)->key)) == 0) /* T2: */
- return (*rootp); /* we found it! */
- rootp = (r < 0) ?
- &(*rootp)->left : /* T3: follow left branch */
- &(*rootp)->right; /* T4: follow right branch */
- }
- return NULL;
-}
-libc_hidden_def(tfind)
-#endif
-
-#ifdef L_tdelete
-/* delete node with given key
-char *key; key to be deleted
-register node **rootp; address of the root of tree
-int (*compar)(); comparison function
-*/
-void *tdelete(__const void *key, void ** vrootp, __compar_fn_t compar)
-{
- node *p;
- register node *q;
- register node *r;
- int cmp;
- register node **rootp = (node **) vrootp;
-
- if (rootp == (struct node_t **)0 || (p = *rootp) == (struct node_t *)0)
- return ((struct node_t *)0);
- while ((cmp = (*compar)(key, (*rootp)->key)) != 0)
- {
- p = *rootp;
- rootp = (cmp < 0) ?
- &(*rootp)->left : /* follow left branch */
- &(*rootp)->right; /* follow right branch */
- if (*rootp == (struct node_t *)0)
- return ((struct node_t *)0); /* key not found */
- }
- r = (*rootp)->right; /* D1: */
- if ((q = (*rootp)->left) == (struct node_t *)0) /* Left (struct node_t *)0? */
- q = r;
- else if (r != (struct node_t *)0) /* Right link is null? */
- {
- if (r->left == (struct node_t *)0) /* D2: Find successor */
- {
- r->left = q;
- q = r;
- }
- else
- { /* D3: Find (struct node_t *)0 link */
- for (q = r->left; q->left != (struct node_t *)0; q = r->left)
- r = q;
- r->left = q->right;
- q->left = (*rootp)->left;
- q->right = (*rootp)->right;
- }
- }
- free((struct node_t *) *rootp); /* D4: Free node */
- *rootp = q; /* link parent to new node */
- return(p);
-}
-#endif
-
-#ifdef L_twalk
-/* Walk the nodes of a tree
-register node *root; Root of the tree to be walked
-register void (*action)(); Function to be called at each node
-register int level;
-*/
-static void trecurse(__const void *vroot, __action_fn_t action, int level)
-{
- register node *root = (node *) vroot;
-
- if (root->left == (struct node_t *)0 && root->right == (struct node_t *)0)
- (*action)(root, leaf, level);
- else
- {
- (*action)(root, preorder, level);
- if (root->left != (struct node_t *)0)
- trecurse(root->left, action, level + 1);
- (*action)(root, postorder, level);
- if (root->right != (struct node_t *)0)
- trecurse(root->right, action, level + 1);
- (*action)(root, endorder, level);
- }
-}
-
-/* void twalk(root, action) Walk the nodes of a tree
-node *root; Root of the tree to be walked
-void (*action)(); Function to be called at each node
-PTR
-*/
-void twalk(__const void *vroot, __action_fn_t action)
-{
- register __const node *root = (node *) vroot;
-
- if (root != (node *)0 && action != (__action_fn_t) 0)
- trecurse(root, action, 0);
-}
-#endif
-
-#ifdef __USE_GNU
-#ifdef L_tdestroy
-/* The standardized functions miss an important functionality: the
- tree cannot be removed easily. We provide a function to do this. */
-static void
-internal_function
-tdestroy_recurse (node *root, __free_fn_t freefct)
-{
- if (root->left != NULL)
- tdestroy_recurse (root->left, freefct);
- if (root->right != NULL)
- tdestroy_recurse (root->right, freefct);
- (*freefct) ((void *) root->key);
- /* Free the node itself. */
- free (root);
-}
-
-libc_hidden_proto(tdestroy)
-void tdestroy (void *vroot, __free_fn_t freefct)
-{
- node *root = (node *) vroot;
- if (root != NULL) {
- tdestroy_recurse (root, freefct);
- }
-}
-libc_hidden_def(tdestroy)
-#endif
-#endif
-
-/* tsearch.c ends here */
More information about the uClibc-cvs
mailing list