Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libbz2 Use single underscore instead of double underscor...
details: https://anonhg.NetBSD.org/src/rev/9c0784d59770
branches: trunk
changeset: 475934:9c0784d59770
user: simonb <simonb%NetBSD.org@localhost>
date: Mon Aug 30 05:12:58 1999 +0000
description:
Use single underscore instead of double underscore for namespace
protection, as per dicussion with Klaus Klein last week.
diffstat:
lib/libbz2/blocksort.c | 4 ++--
lib/libbz2/bzlib.c | 10 +++++-----
lib/libbz2/bzlib_private.h | 28 ++++++++++++++--------------
lib/libbz2/compress.c | 18 +++++++++---------
lib/libbz2/crctable.c | 4 ++--
lib/libbz2/decompress.c | 6 +++---
lib/libbz2/huffman.c | 34 +++++++++++++++++-----------------
lib/libbz2/randtable.c | 4 ++--
8 files changed, 54 insertions(+), 54 deletions(-)
diffs (truncated from 344 to 300 lines):
diff -r 867be4c8df12 -r 9c0784d59770 lib/libbz2/blocksort.c
--- a/lib/libbz2/blocksort.c Mon Aug 30 04:20:22 1999 +0000
+++ b/lib/libbz2/blocksort.c Mon Aug 30 05:12:58 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: blocksort.c,v 1.5 1999/08/20 02:21:48 simonb Exp $ */
+/* $NetBSD: blocksort.c,v 1.6 1999/08/30 05:12:58 simonb Exp $ */
/*-------------------------------------------------------------*/
/*--- Block sorting machinery ---*/
@@ -667,7 +667,7 @@
/*---------------------------------------------*/
-void __BZblockSort ( EState* s )
+void _BZblockSort ( EState* s )
{
Int32 i;
diff -r 867be4c8df12 -r 9c0784d59770 lib/libbz2/bzlib.c
--- a/lib/libbz2/bzlib.c Mon Aug 30 04:20:22 1999 +0000
+++ b/lib/libbz2/bzlib.c Mon Aug 30 05:12:58 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bzlib.c,v 1.6 1999/08/20 02:21:48 simonb Exp $ */
+/* $NetBSD: bzlib.c,v 1.7 1999/08/30 05:12:58 simonb Exp $ */
/*-------------------------------------------------------------*/
/*--- Library top-level functions. ---*/
@@ -365,12 +365,12 @@
progress_in |= copy_input_until_stop ( s );
if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) {
flush_RL ( s );
- __BZcompressBlock ( s, s->mode == BZ_M_FINISHING );
+ _BZcompressBlock ( s, s->mode == BZ_M_FINISHING );
s->state = BZ_S_OUTPUT;
}
else
if (s->nblock >= s->nblockMAX) {
- __BZcompressBlock ( s, False );
+ _BZcompressBlock ( s, False );
s->state = BZ_S_OUTPUT;
}
else
@@ -643,7 +643,7 @@
/*---------------------------------------------------*/
-__inline__ Int32 __BZindexIntoF ( Int32 indx, Int32 *cftab )
+__inline__ Int32 _BZindexIntoF ( Int32 indx, Int32 *cftab )
{
Int32 nb, na, mid;
nb = 0;
@@ -784,7 +784,7 @@
}
}
if (s->state >= BZ_X_MAGIC_1) {
- Int32 r = __BZdecompress ( s );
+ Int32 r = _BZdecompress ( s );
if (r == BZ_STREAM_END) {
if (s->verbosity >= 3)
VPrintf2 ( "\n combined CRCs: stored = 0x%x, computed = 0x%x",
diff -r 867be4c8df12 -r 9c0784d59770 lib/libbz2/bzlib_private.h
--- a/lib/libbz2/bzlib_private.h Mon Aug 30 04:20:22 1999 +0000
+++ b/lib/libbz2/bzlib_private.h Mon Aug 30 05:12:58 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bzlib_private.h,v 1.5 1999/08/20 02:21:48 simonb Exp $ */
+/* $NetBSD: bzlib_private.h,v 1.6 1999/08/30 05:12:58 simonb Exp $ */
/*-------------------------------------------------------------*/
/*--- Private header file for the library. ---*/
@@ -156,7 +156,7 @@
/*-- Stuff for randomising repetitive blocks. --*/
-extern Int32 __BZrNums[512];
+extern Int32 _BZrNums[512];
#define BZ_RAND_DECLS \
Int32 rNToGo; \
@@ -170,7 +170,7 @@
#define BZ_RAND_UPD_MASK \
if (s->rNToGo == 0) { \
- s->rNToGo = __BZrNums[s->rTPos]; \
+ s->rNToGo = _BZrNums[s->rTPos]; \
s->rTPos++; \
if (s->rTPos == 512) s->rTPos = 0; \
} \
@@ -180,7 +180,7 @@
/*-- Stuff for doing CRCs. --*/
-extern UInt32 __BZcrc32Table[256];
+extern UInt32 _BZcrc32Table[256];
#define BZ_INITIALISE_CRC(crcVar) \
{ \
@@ -195,7 +195,7 @@
#define BZ_UPDATE_CRC(crcVar,cha) \
{ \
crcVar = (crcVar << 8) ^ \
- __BZcrc32Table[(crcVar >> 24) ^ \
+ _BZcrc32Table[(crcVar >> 24) ^ \
((UChar)cha)]; \
}
@@ -291,19 +291,19 @@
/*-- externs for compression. --*/
extern void
-__BZblockSort ( EState* );
+_BZblockSort ( EState* );
extern void
-__BZcompressBlock ( EState*, Bool );
+_BZcompressBlock ( EState*, Bool );
extern void
-__BZbsInitWrite ( EState* );
+_BZbsInitWrite ( EState* );
extern void
-__BZhbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
+_BZhbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
extern void
-__BZhbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
+_BZhbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
@@ -490,20 +490,20 @@
(((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
#define BZ_GET_SMALL(cccc) \
- cccc = __BZindexIntoF ( s->tPos, s->cftab ); \
+ cccc = _BZindexIntoF ( s->tPos, s->cftab ); \
s->tPos = GET_LL(s->tPos);
/*-- externs for decompression. --*/
extern Int32
-__BZindexIntoF ( Int32, Int32* );
+_BZindexIntoF ( Int32, Int32* );
extern Int32
-__BZdecompress ( DState* );
+_BZdecompress ( DState* );
extern void
-__BZhbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
+_BZhbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
Int32, Int32, Int32 );
diff -r 867be4c8df12 -r 9c0784d59770 lib/libbz2/compress.c
--- a/lib/libbz2/compress.c Mon Aug 30 04:20:22 1999 +0000
+++ b/lib/libbz2/compress.c Mon Aug 30 05:12:58 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compress.c,v 1.5 1999/08/20 02:21:49 simonb Exp $ */
+/* $NetBSD: compress.c,v 1.6 1999/08/30 05:12:58 simonb Exp $ */
/*-------------------------------------------------------------*/
/*--- Compression machinery (not incl block sorting) ---*/
@@ -68,7 +68,7 @@
/*---------------------------------------------------*/
/*---------------------------------------------------*/
-void __BZbsInitWrite ( EState* s )
+void _BZbsInitWrite ( EState* s )
{
s->bsLive = 0;
s->bsBuff = 0;
@@ -385,8 +385,8 @@
Recompute the tables based on the accumulated frequencies.
--*/
for (t = 0; t < nGroups; t++)
- __BZhbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]),
- alphaSize, 20 );
+ _BZhbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]),
+ alphaSize, 20 );
}
@@ -425,8 +425,8 @@
}
AssertH ( !(maxLen > 20), 3004 );
AssertH ( !(minLen < 1), 3005 );
- __BZhbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]),
- minLen, maxLen, alphaSize );
+ _BZhbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]),
+ minLen, maxLen, alphaSize );
}
/*--- Transmit the mapping table. ---*/
@@ -505,7 +505,7 @@
/*---------------------------------------------------*/
-void __BZcompressBlock ( EState* s, Bool is_last_block )
+void _BZcompressBlock ( EState* s, Bool is_last_block )
{
if (s->nblock > 0) {
@@ -519,12 +519,12 @@
"combined CRC = 0x%8x, size = %d\n",
s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
- __BZblockSort ( s );
+ _BZblockSort ( s );
}
/*-- If this is the first block, create the stream header. --*/
if (s->blockNo == 1) {
- __BZbsInitWrite ( s );
+ _BZbsInitWrite ( s );
bsPutUChar ( s, 'B' );
bsPutUChar ( s, 'Z' );
bsPutUChar ( s, 'h' );
diff -r 867be4c8df12 -r 9c0784d59770 lib/libbz2/crctable.c
--- a/lib/libbz2/crctable.c Mon Aug 30 04:20:22 1999 +0000
+++ b/lib/libbz2/crctable.c Mon Aug 30 05:12:58 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: crctable.c,v 1.5 1999/08/20 02:21:49 simonb Exp $ */
+/* $NetBSD: crctable.c,v 1.6 1999/08/30 05:12:58 simonb Exp $ */
/*-------------------------------------------------------------*/
/*--- Table for doing CRCs ---*/
@@ -69,7 +69,7 @@
comp.compression FAQ.
--*/
-UInt32 __BZcrc32Table[256] = {
+UInt32 _BZcrc32Table[256] = {
/*-- Ugly, innit? --*/
diff -r 867be4c8df12 -r 9c0784d59770 lib/libbz2/decompress.c
--- a/lib/libbz2/decompress.c Mon Aug 30 04:20:22 1999 +0000
+++ b/lib/libbz2/decompress.c Mon Aug 30 05:12:58 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: decompress.c,v 1.6 1999/08/20 06:13:00 simonb Exp $ */
+/* $NetBSD: decompress.c,v 1.7 1999/08/30 05:12:58 simonb Exp $ */
/*-------------------------------------------------------------*/
/*--- Decompression machinery ---*/
@@ -148,7 +148,7 @@
/*---------------------------------------------------*/
-Int32 __BZdecompress ( DState* s )
+Int32 _BZdecompress ( DState* s )
{
UChar uc;
Int32 retVal;
@@ -373,7 +373,7 @@
if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
if (s->len[t][i] < minLen) minLen = s->len[t][i];
}
- __BZhbCreateDecodeTables (
+ _BZhbCreateDecodeTables (
&(s->limit[t][0]),
&(s->base[t][0]),
&(s->perm[t][0]),
diff -r 867be4c8df12 -r 9c0784d59770 lib/libbz2/huffman.c
--- a/lib/libbz2/huffman.c Mon Aug 30 04:20:22 1999 +0000
+++ b/lib/libbz2/huffman.c Mon Aug 30 05:12:58 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: huffman.c,v 1.5 1999/08/20 02:21:49 simonb Exp $ */
+/* $NetBSD: huffman.c,v 1.6 1999/08/30 05:12:58 simonb Exp $ */
/*-------------------------------------------------------------*/
/*--- Huffman coding low-level stuff ---*/
@@ -101,10 +101,10 @@
/*---------------------------------------------------*/
-void __BZhbMakeCodeLengths ( UChar *len,
- Int32 *freq,
- Int32 alphaSize,
- Int32 maxLen )
+void _BZhbMakeCodeLengths ( UChar *len,
+ Int32 *freq,
+ Int32 alphaSize,
+ Int32 maxLen )
{
/*--
Nodes and heap entries run from 1. Entry 0
@@ -173,11 +173,11 @@
/*---------------------------------------------------*/
-void __BZhbAssignCodes ( Int32 *code,
- UChar *length,
- Int32 minLen,
- Int32 maxLen,
- Int32 alphaSize )
+void _BZhbAssignCodes ( Int32 *code,
+ UChar *length,
+ Int32 minLen,
Home |
Main Index |
Thread Index |
Old Index