Move BLOCK_ALIGN* macros back.

The move to nscd-client.h was only needed for some interim version
of the patch.  The final version doesn't need it.  Undo the change.
This commit is contained in:
Ulrich Drepper 2009-05-16 10:29:43 -07:00
parent 95410b7ba2
commit fa546abe9d
3 changed files with 5 additions and 8 deletions

View File

@ -5,9 +5,6 @@
2009-05-15 Ulrich Drepper <drepper@redhat.com> 2009-05-15 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd.h: Move Definition for BLOCK_ALIGN_LOG, BLOCK_ALIGN, and
BLOCK_ALIGN_M1 to ...
* nscd/nscd-client.h: ...here.
* nscd/nscd_helper.c (__nscd_cache_search): Introduce loop counter. * nscd/nscd_helper.c (__nscd_cache_search): Introduce loop counter.
Use it if we absolutely cannot reach any more correct list elements Use it if we absolutely cannot reach any more correct list elements
because that many do not fit into the currently mapped database. because that many do not fit into the currently mapped database.

View File

@ -47,11 +47,6 @@
/* Maximum allowed length for the key. */ /* Maximum allowed length for the key. */
#define MAXKEYLEN 1024 #define MAXKEYLEN 1024
/* Maximum alignment requirement we will encounter. */
#define BLOCK_ALIGN_LOG 3
#define BLOCK_ALIGN (1 << BLOCK_ALIGN_LOG)
#define BLOCK_ALIGN_M1 (BLOCK_ALIGN - 1)
/* Available services. */ /* Available services. */
typedef enum typedef enum

View File

@ -111,6 +111,11 @@ struct database_dyn
/* Path used when not using persistent storage. */ /* Path used when not using persistent storage. */
#define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX" #define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX"
/* Maximum alignment requirement we will encounter. */
#define BLOCK_ALIGN_LOG 3
#define BLOCK_ALIGN (1 << BLOCK_ALIGN_LOG)
#define BLOCK_ALIGN_M1 (BLOCK_ALIGN - 1)
/* Default value for the maximum size of the database files. */ /* Default value for the maximum size of the database files. */
#define DEFAULT_MAX_DB_SIZE (32 * 1024 * 1024) #define DEFAULT_MAX_DB_SIZE (32 * 1024 * 1024)