Skip to content

Commit

Permalink
fixup commit for tag 'DBM_1_6_RTM'
Browse files Browse the repository at this point in the history
  • Loading branch information
cvs2hg committed Nov 20, 2001
1 parent 47745e4 commit 72efeb9
Show file tree
Hide file tree
Showing 1,386 changed files with 60 additions and 560,858 deletions.
6 changes: 4 additions & 2 deletions dbm/src/h_page.c
View file
Expand Up @@ -1123,7 +1123,7 @@ __free_ovflpage(HTAB *hashp, BUFHEAD *obufp)
ndx = (((uint16)addr) >> SPLITSHIFT);
bit_address =
(ndx ? hashp->SPARES[ndx - 1] : 0) + (addr & SPLITMASK) - 1;
if (bit_address < (unsigned)hashp->LAST_FREED)
if (bit_address < (uint32)hashp->LAST_FREED)
hashp->LAST_FREED = bit_address;
free_page = (bit_address >> (hashp->BSHIFT + BYTE_SHIFT));
free_bit = bit_address & ((hashp->BSIZE << BYTE_SHIFT) - 1);
Expand Down Expand Up @@ -1165,11 +1165,13 @@ open_temp(HTAB *hashp)
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
sigset_t set, oset;
#endif
#if !defined(macintosh)
char * tmpdir;
size_t len;
char last;
#endif
static const char namestr[] = "/_hashXXXXXX";
char filename[1024];
char last;

#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
/* Block signals; make sure file goes away at process exit. */
Expand Down
8 changes: 4 additions & 4 deletions dbm/src/hash.c
View file
Expand Up @@ -868,7 +868,7 @@ hash_access(

if (bp[1] >= REAL_KEY) {
/* Real key/data pair */
if (size == (unsigned)(off - *bp) &&
if (size == (unsigned long)(off - *bp) &&
memcmp(kp, rbufp->page + *bp, size) == 0)
goto found;
off = bp[1];
Expand Down Expand Up @@ -1012,7 +1012,7 @@ hash_seq(
for (bp = NULL; !bp || !bp[0]; ) {
if (!(bufp = hashp->cpage)) {
for (bucket = hashp->cbucket;
bucket <= (unsigned)hashp->MAX_BUCKET;
bucket <= (uint32)hashp->MAX_BUCKET;
bucket++, hashp->cndx = 1) {
bufp = __get_buf(hashp, bucket, NULL, 0);
if (!bufp)
Expand Down Expand Up @@ -1116,7 +1116,7 @@ __expand_table(HTAB *hashp)
hashp->OVFL_POINT = spare_ndx;
}

if (new_bucket > (unsigned)hashp->HIGH_MASK) {
if (new_bucket > (uint32)hashp->HIGH_MASK) {
/* Starting a new doubling */
hashp->LOW_MASK = hashp->HIGH_MASK;
hashp->HIGH_MASK = new_bucket | hashp->LOW_MASK;
Expand Down Expand Up @@ -1152,7 +1152,7 @@ __call_hash(HTAB *hashp, char *k, size_t len)

n = hashp->hash(k, len);
bucket = n & hashp->HIGH_MASK;
if (bucket > (unsigned)hashp->MAX_BUCKET)
if (bucket > (uint32)hashp->MAX_BUCKET)
bucket = bucket & hashp->LOW_MASK;
return (bucket);
}
Expand Down
12 changes: 6 additions & 6 deletions dbm/tests/lots.c
View file
Expand Up @@ -139,7 +139,7 @@ DBT * MakeLargeKey(int32 num)
static DBT rv;
static char *string_rv=0;
int rep_char;
int32 size;
size_t size;

if(string_rv)
free(string_rv);
Expand All @@ -154,9 +154,9 @@ DBT * MakeLargeKey(int32 num)

/* malloc a string low_bits wide */
size = low_bits*sizeof(char);
string_rv = (char *)malloc((size_t)size);
string_rv = (char *)malloc(size);

memset(string_rv, rep_char, (size_t)size);
memset(string_rv, rep_char, size);

rv.data = string_rv;
rv.size = size;
Expand Down Expand Up @@ -223,7 +223,7 @@ int
VerifyData(DBT *data, int32 num, key_type_enum key_type)
{
int32 count, compare_num;
uint32 size;
size_t size;
int32 *int32_array;

/* The first int32 is count
Expand Down Expand Up @@ -327,7 +327,7 @@ GenData(int32 num)
int32 n;
static DBT *data=0;
int32 *int32_array;
int32 size;
size_t size;

if(!data)
{
Expand All @@ -346,7 +346,7 @@ GenData(int32 num)


size = sizeof(int32)*(n+1);
int32_array = (int32 *) malloc((size_t)size);
int32_array = (int32 *) malloc(size);

memcpy(&int32_array[0], &n, sizeof(int32));

Expand Down
28 changes: 18 additions & 10 deletions security/coreconf/OSF1V5.1.mk → security/coreconf/HP-UXB.11.11.mk
View file
Expand Up @@ -30,18 +30,26 @@
# may use your version of this file under either the MPL or the
# GPL.
#
# On OSF1 V5.1, pthreads is the default implementation strategy.
# Classic nspr is also available.
# On HP-UX 10.30 and 11.x, the default implementation strategy is
# pthreads. Classic nspr and pthreads-user are also available.
#
ifneq ($(OS_RELEASE),V3.2)
USE_PTHREADS = 1
ifeq ($(CLASSIC_NSPR), 1)
USE_PTHREADS =
IMPL_STRATEGY := _CLASSIC
endif

ifeq ($(OS_RELEASE),B.11.11)
OS_CFLAGS += -DHPUX10
DEFAULT_IMPL_STRATEGY = _PTH
endif

#
# To use the true pthread (kernel thread) library on 10.30 and
# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
# The _REENTRANT macro is deprecated.
#

ifdef USE_PTHREADS
OS_CFLAGS += -D_POSIX_C_SOURCE=199506L
endif

#
# Config stuff for DEC OSF/1 V5.1
# Config stuff for HP-UXB.11.11.
#
include $(CORE_DEPTH)/coreconf/OSF1.mk
include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
5 changes: 5 additions & 0 deletions security/coreconf/Linux.mk
View file
Expand Up @@ -69,6 +69,10 @@ else
ifeq ($(OS_TEST),sparc64)
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = sparc
else
ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = arm
else
OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
CPU_ARCH = x86
Expand All @@ -77,6 +81,7 @@ endif
endif
endif
endif
endif


LIBC_TAG = _glibc
Expand Down
3 changes: 3 additions & 0 deletions security/coreconf/NetBSD.mk
View file
Expand Up @@ -40,8 +40,11 @@ CC = gcc
CCC = g++
RANLIB = ranlib

CPU_ARCH := $(shell uname -p)
ifeq ($(CPU_ARCH),i386)
OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
endif

ifndef OBJECT_FMT
OBJECT_FMT := $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
Expand Down
2 changes: 0 additions & 2 deletions security/coreconf/OS2.mk
View file
Expand Up @@ -117,8 +117,6 @@ else # XP_OS2_VACPP
# On OS/2 we proudly support gbash...
#
SHELL = GBASH.EXE
AS = alp.exe
ASFLAGS = -Od
CCC = icc -q -DXP_OS2 -DOS2=4 -N10
LINK = -ilink
AR = -ilib /NOL /NOI /O:$(subst /,\\,$@)
Expand Down
10 changes: 6 additions & 4 deletions security/coreconf/jdk.mk
View file
Expand Up @@ -139,7 +139,7 @@ ifeq ($(OS_ARCH), SunOS)
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)

# (3) specify "linker" information
JAVA_CPU = $(shell uname -p)
JAVA_CPU = sparc

ifeq ($(JDK_VERSION), 1.1)
JAVA_LIBDIR = lib/$(JAVA_CPU)
Expand All @@ -153,9 +153,8 @@ endif
JAVA_CLIBS = -lthread

ifneq ($(JDK_VERSION), 1.1)
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)
JAVA_LIBS += -ljvm -ljava
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
else
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -ljava
endif
Expand Down Expand Up @@ -400,6 +399,7 @@ endif
endif


ifdef NS_USE_JDK_TOOLSET
#######################################################################
# [5] Define JDK "Core Components" toolset; #
# (always allow a user to override these values) #
Expand Down Expand Up @@ -608,3 +608,5 @@ ifeq ($(SERIALVER),)
SERIALVER_FLAGS = $(JDK_THREADING_MODEL_OPT)
SERIALVER = $(SERIALVER_PROG) $(SERIALVER_FLAGS)
endif

endif
3 changes: 1 addition & 2 deletions security/coreconf/jniregen.pl
View file
Expand Up @@ -99,9 +99,8 @@

if( @filelist ) {
$cmd = "$javah " . join(" ",@filelist);
$cmd =~ s/\'/\"/g; # because windows doesn't understand single quote
print "$cmd\n";
exit (system($cmd) >> 8);
system("$cmd");
} else {
print "All JNI header files up to date.\n"
}
55 changes: 13 additions & 42 deletions security/coreconf/rules.mk
View file
Expand Up @@ -242,30 +242,21 @@ endif
release_policy::
+$(LOOP_OVER_DIRS)

ifndef NO_MD_RELEASE
ifdef LIBRARY
MD_LIB_RELEASE_FILES += $(LIBRARY)
endif
ifdef SHARED_LIBRARY
MD_LIB_RELEASE_FILES += $(SHARED_LIBRARY)
endif
ifdef IMPORT_LIBRARY
MD_LIB_RELEASE_FILES += $(IMPORT_LIBRARY)
endif
ifdef PROGRAM
MD_BIN_RELEASE_FILES += $(PROGRAM)
endif
ifdef PROGRAMS
MD_BIN_RELEASE_FILES += $(PROGRAMS)
endif
endif

release_md::
ifneq ($(MD_LIB_RELEASE_FILES),)
$(INSTALL) -m 444 $(MD_LIB_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
ifdef LIBRARY
$(INSTALL) -m 444 $(LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
endif
ifneq ($(MD_BIN_RELEASE_FILES),)
$(INSTALL) -m 555 $(MD_BIN_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR)
ifdef SHARED_LIBRARY
$(INSTALL) -m 555 $(SHARED_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
endif
ifdef IMPORT_LIBRARY
$(INSTALL) -m 555 $(IMPORT_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
endif
ifdef PROGRAM
$(INSTALL) -m 555 $(PROGRAM) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR)
endif
ifdef PROGRAMS
$(INSTALL) -m 555 $(PROGRAMS) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR)
endif
+$(LOOP_OVER_DIRS)

Expand Down Expand Up @@ -417,22 +408,14 @@ WCCFLAGS3 := $(subst -D,-d,$(WCCFLAGS2))
$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
@$(MAKE_OBJDIR)
ifdef USE_NT_C_SYNTAX
ifdef XP_OS2_VACPP
$(CC) -Fo$@ -c $(CFLAGS) $(subst /,\\,$(shell pwd)/$<)
else
$(CC) -Fo$@ -c $(CFLAGS) $(subst /,\\,$<)
endif
else
$(CC) -o $@ -c $(CFLAGS) $<
endif

$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
ifdef USE_NT_C_SYNTAX
ifdef XP_OS2_VACPP
$(CC) -Fo$@ -c $(CFLAGS) $(subst /,\\,$(shell pwd)/$<)
else
$(CC) -Fo$@ -c $(CFLAGS) $(subst /,\\,$<)
endif
else
$(CC) -o $@ -c $(CFLAGS) $<
endif
Expand All @@ -445,11 +428,7 @@ endif

$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm
@$(MAKE_OBJDIR)
ifdef XP_OS2_VACPP
cd $(OBJDIR) ; $(AS) $(ASFLAGS) $(subst /,\\,$(shell pwd)/$<)
else
$(AS) -Fo$@ $(ASFLAGS) -c $<
endif

$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S
@$(MAKE_OBJDIR)
Expand All @@ -458,11 +437,7 @@ $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S
$(OBJDIR)/$(PROG_PREFIX)%: %.cpp
@$(MAKE_OBJDIR)
ifdef USE_NT_C_SYNTAX
ifdef XP_OS2_VACPP
$(CCC) -Fo$@ -c $(CFLAGS) $(subst /,\\,$(shell pwd)/$<)
else
$(CCC) -Fo$@ -c $(CFLAGS) $<
endif
else
$(CCC) -o $@ -c $(CFLAGS) $<
endif
Expand All @@ -482,11 +457,7 @@ ifdef STRICT_CPLUSPLUS_SUFFIX
rm -f $(OBJDIR)/t_$*.cc
else
ifdef USE_NT_C_SYNTAX
ifdef XP_OS2_VACPP
$(CCC) -Fo$@ -c $(CFLAGS) $(subst /,\\,$(shell pwd)/$<)
else
$(CCC) -Fo$@ -c $(CFLAGS) $<
endif
else
$(CCC) -o $@ -c $(CFLAGS) $<
endif
Expand Down

0 comments on commit 72efeb9

Please sign in to comment.