database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-09 14:21:03 +03:00
Code Activity

Removed all C++ style comments. Ticket #3172. (CVS 5207)

Browse Source 
FossilOrigin-Name: 59f72425eb9acd270110a6a739f98a045c555f23
This commit is contained in:
shane
2008-06-12 02:16:44 +00:00
parent cb0413407c
commit 022e8afe49
4 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Additional\srefinements\sto\sthe\snew\ssqlite3_initialize()\sinterface\sdesign.\s(CVS\s5206) C Removed\sall\sC++\sstyle\scomments.\sTicket\s#3172.\s(CVS\s5207)
D 2008-06-12T00:07:29 D 2008-06-12T02:16:45
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in ce92ea8dc7adfb743757794f51c10d1b0d9c55e4 F Makefile.in ce92ea8dc7adfb743757794f51c10d1b0d9c55e4
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -130,7 +130,7 @@ F src/mutex_w32.c 133698096a2c4e81cd11ea6f4de7891c66f7b9f7
F src/os.c 284abcb97ffdaf5f0b08fa4c5fe1fe93dd86b416 F src/os.c 284abcb97ffdaf5f0b08fa4c5fe1fe93dd86b416
F src/os.h c9a7f94e80193fd4cf27f5c5698eb56753f1b05a F src/os.h c9a7f94e80193fd4cf27f5c5698eb56753f1b05a
F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
F src/os_os2.c 1578149e21c4eac42c7f230a6f40500846f8e781 F src/os_os2.c ae37c5971e8b0cfc77e6bf685aa9dd43414208d8
F src/os_unix.c 47936aee8265e482faa626141d97d896aa981ef4 F src/os_unix.c 47936aee8265e482faa626141d97d896aa981ef4
F src/os_win.c 0d975b131b2b104d6d69d9f16bdf3c8cec28e81d F src/os_win.c 0d975b131b2b104d6d69d9f16bdf3c8cec28e81d
F src/pager.c be98ceeb55bbcda9251c1a846d28c3d323885708 F src/pager.c be98ceeb55bbcda9251c1a846d28c3d323885708
@@ -177,7 +177,7 @@ F src/tokenize.c d07c7482a59dd8e02f3f73e86ff55eccdc0d8f26
F src/trigger.c 1e751f8d5ceeb328d26bf1ccfb2de50653670d49 F src/trigger.c 1e751f8d5ceeb328d26bf1ccfb2de50653670d49
F src/update.c 2d7143b9014e955509cc4f323f9a9584fb898f34 F src/update.c 2d7143b9014e955509cc4f323f9a9584fb898f34
F src/utf.c 8c94fa10efc78c2568d08d436acc59df4df7191b F src/utf.c 8c94fa10efc78c2568d08d436acc59df4df7191b
F src/util.c 43277088f8fea4109a640aa46731b8752c3fb4a7 F src/util.c 512027b58e8b9b11743e5ae70837c45b53696b26
F src/vacuum.c a5c289e561ed72283e97d2485491986bc7d684eb F src/vacuum.c a5c289e561ed72283e97d2485491986bc7d684eb
F src/vdbe.c 1936425c3455535a1a20e26a65c470fb009a1ed8 F src/vdbe.c 1936425c3455535a1a20e26a65c470fb009a1ed8
F src/vdbe.h 1e3722d471739c2b213c6283b60373290e52f7ea F src/vdbe.h 1e3722d471739c2b213c6283b60373290e52f7ea
@@ -593,7 +593,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 4a77ff5b588f4c83959591c208a8b20224b75a66 P 14a9b9453bc1c85785fcc44617af80912f5118c8
R 2ee7086af6d477574d9996bfe52c2048 R 2f32538fd41301b7db27aba00bd1cd70
U drh U shane
Z cf96ca2091c06c69535cad9d1b243124 Z 5f5579143d41d2431d70f73b40c5dc99

2
manifest.uuid
View File

@@ -1 +1 @@
14a9b9453bc1c85785fcc44617af80912f5118c8 59f72425eb9acd270110a6a739f98a045c555f23

10
src/os_os2.c
View File

@@ -12,7 +12,7 @@
** **
** This file contains code that is specific to OS/2. ** This file contains code that is specific to OS/2.
** **
** $Id: os_os2.c,v 1.40 2008/05/20 19:08:54 pweilbacher Exp $ ** $Id: os_os2.c,v 1.41 2008/06/12 02:16:45 shane Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -655,7 +655,7 @@ static int os2Open(
OSTRACE2( "OPEN want %d\n", flags ); OSTRACE2( "OPEN want %d\n", flags );
//ulOpenMode = flags & SQLITE_OPEN_READWRITE ? OPEN_ACCESS_READWRITE : OPEN_ACCESS_READONLY; /*ulOpenMode = flags & SQLITE_OPEN_READWRITE ? OPEN_ACCESS_READWRITE : OPEN_ACCESS_READONLY;*/
if( flags & SQLITE_OPEN_READWRITE ){ if( flags & SQLITE_OPEN_READWRITE ){
ulOpenMode |= OPEN_ACCESS_READWRITE; ulOpenMode |= OPEN_ACCESS_READWRITE;
OSTRACE1( "OPEN read/write\n" ); OSTRACE1( "OPEN read/write\n" );
@@ -664,7 +664,7 @@ static int os2Open(
OSTRACE1( "OPEN read only\n" ); OSTRACE1( "OPEN read only\n" );
} }
//ulOpenFlags = flags & SQLITE_OPEN_CREATE ? OPEN_ACTION_CREATE_IF_NEW : OPEN_ACTION_FAIL_IF_NEW; /*ulOpenFlags = flags & SQLITE_OPEN_CREATE ? OPEN_ACTION_CREATE_IF_NEW : OPEN_ACTION_FAIL_IF_NEW;*/
if( flags & SQLITE_OPEN_CREATE ){ if( flags & SQLITE_OPEN_CREATE ){
ulOpenFlags |= OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW; ulOpenFlags |= OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
OSTRACE1( "OPEN open new/create\n" ); OSTRACE1( "OPEN open new/create\n" );
@@ -673,7 +673,7 @@ static int os2Open(
OSTRACE1( "OPEN open existing\n" ); OSTRACE1( "OPEN open existing\n" );
} }
//ulOpenMode |= flags & SQLITE_OPEN_MAIN_DB ? OPEN_SHARE_DENYNONE : OPEN_SHARE_DENYWRITE; /*ulOpenMode |= flags & SQLITE_OPEN_MAIN_DB ? OPEN_SHARE_DENYNONE : OPEN_SHARE_DENYWRITE;*/
if( flags & SQLITE_OPEN_MAIN_DB ){ if( flags & SQLITE_OPEN_MAIN_DB ){
ulOpenMode |= OPEN_SHARE_DENYNONE; ulOpenMode |= OPEN_SHARE_DENYNONE;
OSTRACE1( "OPEN share read/write\n" ); OSTRACE1( "OPEN share read/write\n" );
@@ -685,7 +685,7 @@ static int os2Open(
if( flags & (SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_TEMP_JOURNAL if( flags & (SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_TEMP_JOURNAL
| SQLITE_OPEN_SUBJOURNAL) ){ | SQLITE_OPEN_SUBJOURNAL) ){
char pathUtf8[CCHMAXPATH]; char pathUtf8[CCHMAXPATH];
//ulFileAttribute = FILE_HIDDEN; //for debugging, we want to make sure it is deleted /*ulFileAttribute = FILE_HIDDEN; //for debugging, we want to make sure it is deleted*/
ulFileAttribute = FILE_NORMAL; ulFileAttribute = FILE_NORMAL;
sqlite3OsFullPathname( pVfs, zName, CCHMAXPATH, pathUtf8 ); sqlite3OsFullPathname( pVfs, zName, CCHMAXPATH, pathUtf8 );
pFile->pathToDel = convertUtf8PathToCp( pathUtf8 ); pFile->pathToDel = convertUtf8PathToCp( pathUtf8 );

72
src/util.c
View File

@@ -14,7 +14,7 @@
** This file contains functions for allocating memory, comparing ** This file contains functions for allocating memory, comparing
** strings, and stuff like that. ** strings, and stuff like that.
** **
** $Id: util.c,v 1.230 2008/05/19 15:54:59 drh Exp $ ** $Id: util.c,v 1.231 2008/06/12 02:16:45 shane Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <stdarg.h> #include <stdarg.h>
@@ -561,7 +561,7 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
u32 a,b,s; u32 a,b,s;
a = *p; a = *p;
// a: p0 (unmasked) /* a: p0 (unmasked) */
if (!(a&0x80)) if (!(a&0x80))
{ {
*v = a; *v = a;
@@ -570,7 +570,7 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
p++; p++;
b = *p; b = *p;
// b: p1 (unmasked) /* b: p1 (unmasked) */
if (!(b&0x80)) if (!(b&0x80))
{ {
a &= 0x7f; a &= 0x7f;
@@ -583,7 +583,7 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
p++; p++;
a = a<<14; a = a<<14;
a |= *p; a |= *p;
// a: p0<<14 | p2 (unmasked) /* a: p0<<14 | p2 (unmasked) */
if (!(a&0x80)) if (!(a&0x80))
{ {
a &= (0x7f<<14)|(0x7f); a &= (0x7f<<14)|(0x7f);
@@ -594,41 +594,41 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
return 3; return 3;
} }
// CSE1 from below /* CSE1 from below */
a &= (0x7f<<14)|(0x7f); a &= (0x7f<<14)|(0x7f);
p++; p++;
b = b<<14; b = b<<14;
b |= *p; b |= *p;
// b: p1<<14 | p3 (unmasked) /* b: p1<<14 | p3 (unmasked) */
if (!(b&0x80)) if (!(b&0x80))
{ {
b &= (0x7f<<14)|(0x7f); b &= (0x7f<<14)|(0x7f);
// moved CSE1 up /* moved CSE1 up */
// a &= (0x7f<<14)|(0x7f); /* a &= (0x7f<<14)|(0x7f); */
a = a<<7; a = a<<7;
a |= b; a |= b;
*v = a; *v = a;
return 4; return 4;
} }
// a: p0<<14 | p2 (masked) /* a: p0<<14 | p2 (masked) */
// b: p1<<14 | p3 (unmasked) /* b: p1<<14 | p3 (unmasked) */
// 1:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked) /* 1:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked) */
// moved CSE1 up /* moved CSE1 up */
// a &= (0x7f<<14)|(0x7f); /* a &= (0x7f<<14)|(0x7f); */
b &= (0x7f<<14)|(0x7f); b &= (0x7f<<14)|(0x7f);
s = a; s = a;
// s: p0<<14 | p2 (masked) /* s: p0<<14 | p2 (masked) */
p++; p++;
a = a<<14; a = a<<14;
a |= *p; a |= *p;
// a: p0<<28 | p2<<14 | p4 (unmasked) /* a: p0<<28 | p2<<14 | p4 (unmasked) */
if (!(a&0x80)) if (!(a&0x80))
{ {
// we can skip these cause they were (effectively) done above in calc'ing s /* we can skip these cause they were (effectively) done above in calc'ing s */
// a &= (0x7f<<28)|(0x7f<<14)|(0x7f); /* a &= (0x7f<<28)|(0x7f<<14)|(0x7f); */
// b &= (0x7f<<14)|(0x7f); /* b &= (0x7f<<14)|(0x7f); */
b = b<<7; b = b<<7;
a |= b; a |= b;
s = s>>18; s = s>>18;
@@ -636,19 +636,19 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
return 5; return 5;
} }
// 2:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked) /* 2:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked) */
s = s<<7; s = s<<7;
s |= b; s |= b;
// s: p0<<21 | p1<<14 | p2<<7 | p3 (masked) /* s: p0<<21 | p1<<14 | p2<<7 | p3 (masked) */
p++; p++;
b = b<<14; b = b<<14;
b |= *p; b |= *p;
// b: p1<<28 | p3<<14 | p5 (unmasked) /* b: p1<<28 | p3<<14 | p5 (unmasked) */
if (!(b&0x80)) if (!(b&0x80))
{ {
// we can skip this cause it was (effectively) done above in calc'ing s /* we can skip this cause it was (effectively) done above in calc'ing s */
// b &= (0x7f<<28)|(0x7f<<14)|(0x7f); /* b &= (0x7f<<28)|(0x7f<<14)|(0x7f); */
a &= (0x7f<<14)|(0x7f); a &= (0x7f<<14)|(0x7f);
a = a<<7; a = a<<7;
a |= b; a |= b;
@@ -660,7 +660,7 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
p++; p++;
a = a<<14; a = a<<14;
a |= *p; a |= *p;
// a: p2<<28 | p4<<14 | p6 (unmasked) /* a: p2<<28 | p4<<14 | p6 (unmasked) */
if (!(a&0x80)) if (!(a&0x80))
{ {
a &= (0x7f<<28)|(0x7f<<14)|(0x7f); a &= (0x7f<<28)|(0x7f<<14)|(0x7f);
@@ -672,17 +672,17 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
return 7; return 7;
} }
// CSE2 from below /* CSE2 from below */
a &= (0x7f<<14)|(0x7f); a &= (0x7f<<14)|(0x7f);
p++; p++;
b = b<<14; b = b<<14;
b |= *p; b |= *p;
// b: p3<<28 | p5<<14 | p7 (unmasked) /* b: p3<<28 | p5<<14 | p7 (unmasked) */
if (!(b&0x80)) if (!(b&0x80))
{ {
b &= (0x7f<<28)|(0x7f<<14)|(0x7f); b &= (0x7f<<28)|(0x7f<<14)|(0x7f);
// moved CSE2 up /* moved CSE2 up */
// a &= (0x7f<<14)|(0x7f); /* a &= (0x7f<<14)|(0x7f); */
a = a<<7; a = a<<7;
a |= b; a |= b;
s = s>>4; s = s>>4;
@@ -693,10 +693,10 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
p++; p++;
a = a<<15; a = a<<15;
a |= *p; a |= *p;
// a: p4<<29 | p6<<15 | p8 (unmasked) /* a: p4<<29 | p6<<15 | p8 (unmasked) */
// moved CSE2 up /* moved CSE2 up */
// a &= (0x7f<<29)|(0x7f<<15)|(0xff); /* a &= (0x7f<<29)|(0x7f<<15)|(0xff); */
b &= (0x7f<<14)|(0x7f); b &= (0x7f<<14)|(0x7f);
b = b<<8; b = b<<8;
a |= b; a |= b;
@@ -723,7 +723,7 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
u32 a,b; u32 a,b;
a = *p; a = *p;
// a: p0 (unmasked) /* a: p0 (unmasked) */
#ifndef getVarint32 #ifndef getVarint32
if (!(a&0x80)) if (!(a&0x80))
{ {
@@ -734,7 +734,7 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
p++; p++;
b = *p; b = *p;
// b: p1 (unmasked) /* b: p1 (unmasked) */
if (!(b&0x80)) if (!(b&0x80))
{ {
a &= 0x7f; a &= 0x7f;
@@ -746,7 +746,7 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
p++; p++;
a = a<<14; a = a<<14;
a |= *p; a |= *p;
// a: p0<<14 | p2 (unmasked) /* a: p0<<14 | p2 (unmasked) */
if (!(a&0x80)) if (!(a&0x80))
{ {
a &= (0x7f<<14)|(0x7f); a &= (0x7f<<14)|(0x7f);
@@ -759,7 +759,7 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
p++; p++;
b = b<<14; b = b<<14;
b |= *p; b |= *p;
// b: p1<<14 | p3 (unmasked) /* b: p1<<14 | p3 (unmasked) */
if (!(b&0x80)) if (!(b&0x80))
{ {
b &= (0x7f<<14)|(0x7f); b &= (0x7f<<14)|(0x7f);
@@ -772,7 +772,7 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
p++; p++;
a = a<<14; a = a<<14;
a |= *p; a |= *p;
// a: p0<<28 | p2<<14 | p4 (unmasked) /* a: p0<<28 | p2<<14 | p4 (unmasked) */
if (!(a&0x80)) if (!(a&0x80))
{ {
a &= (0x7f<<28)|(0x7f<<14)|(0x7f); a &= (0x7f<<28)|(0x7f<<14)|(0x7f);