debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtinfo subtree DtMmdb

Browse Source
This commit is contained in:
Ulrich Wilkens
2012-10-14 15:38:27 +02:00
committed by Jon Trulson
parent b92cf08899
commit 8c8363f4a5
184 changed files with 1090 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_put.c
View File

@@ -289,7 +289,7 @@ bt_fast(t, key, data, exactp)
const DBT *key, *data;
int *exactp;
{
EPG e;
static EPG e;
PAGE *h;
size_t nbytes;
int cmp;

8
cde/programs/dtinfo/DtMmdb/btree_berkeley/cdefs.h
View File

@@ -60,8 +60,12 @@
#define _CDEFS_H_
#if defined(__cplusplus)
#ifndef __BEGIN_DECLS
#define __BEGIN_DECLS extern "C" {
#endif
#ifndef __END_DECLS
#define __END_DECLS };
#endif
#else
#define __BEGIN_DECLS
#define __END_DECLS
@@ -79,7 +83,9 @@
#undef __P
#endif
#define __P(protos) protos /* full-blown ANSI C */
#ifndef __CONCAT
#define __CONCAT(x,y) x ## y
#endif
#define __STRING(x) #x
#else /* !(__STDC__ || __cplusplus) */
@@ -114,7 +120,9 @@
*/
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
#define __dead __volatile
#ifndef __pure
#define __pure __const
#endif
#else
#define __dead
#define __pure

12
cde/programs/dtinfo/DtMmdb/btree_berkeley/memmove.c
View File

@@ -111,13 +111,13 @@ bcopy(src0, dst0, length)
/*
* Copy forward.
*/
t = (int)src; /* only need low bits */
if ((t | (int)dst) & wmask) {
t = (size_t)src; /* only need low bits */
if ((t | (size_t)dst) & wmask) {
/*
* Try to align operands. This cannot be done
* unless the low bits match.
*/
if ((t ^ (int)dst) & wmask || length < wsize)
if ((t ^ (size_t)dst) & wmask || length < wsize)
t = length;
else
t = wsize - (t & wmask);
@@ -139,9 +139,9 @@ bcopy(src0, dst0, length)
*/
src += length;
dst += length;
t = (int)src;
if ((t | (int)dst) & wmask) {
if ((t ^ (int)dst) & wmask || length <= wsize)
t = (size_t)src;
if ((t | (size_t)dst) & wmask) {
if ((t ^ (size_t)dst) & wmask || length <= wsize)
t = length;
else
t &= wmask;

5
cde/programs/dtinfo/DtMmdb/btree_berkeley/snprintf.c
View File

@@ -25,6 +25,7 @@
#include "cdefs.h"
#include <compat.h>
#include <string.h>
#ifdef __STDC__
#include <stdarg.h>
@@ -52,7 +53,7 @@ snprintf(str, n, fmt, va_alist)
va_start(ap);
#endif
#ifdef VSPRINTF_CHARSTAR
rp = vsprintf(str, fmt, ap);
rp = (char*)(size_t)vsprintf(str, fmt, ap);
va_end(ap);
return (strlen(rp));
#else
@@ -70,7 +71,7 @@ vsnprintf(str, n, fmt, ap)
va_list ap;
{
#ifdef VSPRINTF_CHARSTAR
return (strlen(vsprintf(str, fmt, ap)));
return (strlen((char*)(size_t)vsprintf(str, fmt, ap)));
#else
return (vsprintf(str, fmt, ap));
#endif