1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00

Clean up obsolete comments in printf.c.

FossilOrigin-Name: 97ef4f5013731fa3a0f72451b7e8c9aec5523104
This commit is contained in:
drh
2011-10-12 18:52:59 +00:00
parent 8a575d9aa9
commit ed1fddf462
3 changed files with 18 additions and 80 deletions

View File

@@ -1,5 +1,5 @@
C Clarify\sa\scomment\sand\sfix\sa\scode\sformatting\sissue\sin\sbtree.c. C Clean\sup\sobsolete\scomments\sin\sprintf.c.
D 2011-10-12T17:00:28.920 D 2011-10-12T18:52:59.595
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -175,7 +175,7 @@ F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
F src/pcache1.c 24f5e85a78514584b46190260ba7ab0a66312197 F src/pcache1.c 24f5e85a78514584b46190260ba7ab0a66312197
F src/pragma.c 68d7db4fc9de8bcfae94c1d43120531ec252b9c0 F src/pragma.c 68d7db4fc9de8bcfae94c1d43120531ec252b9c0
F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4 F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
F src/printf.c 1cd24df913bafc0cb69dc7ae68af85cc480925aa F src/printf.c c6ec4b345655a90691fd69de46bfd10f263b1aaf
F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4 F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
@@ -966,7 +966,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P b94a80a832777f0e639f6a81fcfe169bf970a8c0 P 4f1a558d0013fbf3fe00bdf5883e61a1f3779831
R 95fde01c6f40604b21834caf64be98db R 3b4749da52d09d736fe4f908b2fe6beb
U drh U drh
Z 389b1315be168f08d6aa9a5e7d0d3d85 Z 30471bd3e45c0db38d5307794f8fd877

View File

@@ -1 +1 @@
4f1a558d0013fbf3fe00bdf5883e61a1f3779831 97ef4f5013731fa3a0f72451b7e8c9aec5523104

View File

@@ -7,48 +7,10 @@
** **
************************************************************************** **************************************************************************
** **
** The following modules is an enhanced replacement for the "printf" subroutines ** This file contains code for a set of "printf"-like routines. These
** found in the standard C library. The following enhancements are ** routines format strings much like the printf() from the standard C
** supported: ** library, though the implementation here has enhancements to support
** ** SQLlite.
** + Additional functions. The standard set of "printf" functions
** includes printf, fprintf, sprintf, vprintf, vfprintf, and
** vsprintf. This module adds the following:
**
** * snprintf -- Works like sprintf, but has an extra argument
** which is the size of the buffer written to.
**
** * mprintf -- Similar to sprintf. Writes output to memory
** obtained from malloc.
**
** * xprintf -- Calls a function to dispose of output.
**
** * nprintf -- No output, but returns the number of characters
** that would have been output by printf.
**
** * A v- version (ex: vsnprintf) of every function is also
** supplied.
**
** + A few extensions to the formatting notation are supported:
**
** * The "=" flag (similar to "-") causes the output to be
** be centered in the appropriately sized field.
**
** * The %b field outputs an integer in binary notation.
**
** * The %c field now accepts a precision. The character output
** is repeated by the number of times the precision specifies.
**
** * The %' field works like %c, but takes as its character the
** next character of the format string, instead of the next
** argument. For example, printf("%.78'-") prints 78 minus
** signs, the same as printf("%.78c",'-').
**
** + When compiled using GCC on a SPARC, this version of printf is
** faster than the library printf for SUN OS 4.1.
**
** + All functions are fully reentrant.
**
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -187,7 +149,7 @@ static void appendSpace(StrAccum *pAccum, int N){
/* /*
** On machines with a small stack size, you can redefine the ** On machines with a small stack size, you can redefine the
** SQLITE_PRINT_BUF_SIZE to be less than 350. ** SQLITE_PRINT_BUF_SIZE to be something smaller, if desired.
*/ */
#ifndef SQLITE_PRINT_BUF_SIZE #ifndef SQLITE_PRINT_BUF_SIZE
# define SQLITE_PRINT_BUF_SIZE 70 # define SQLITE_PRINT_BUF_SIZE 70
@@ -195,31 +157,7 @@ static void appendSpace(StrAccum *pAccum, int N){
#define etBUFSIZE SQLITE_PRINT_BUF_SIZE /* Size of the output buffer */ #define etBUFSIZE SQLITE_PRINT_BUF_SIZE /* Size of the output buffer */
/* /*
** The root program. All variations call this core. ** Render a string given by "fmt" into the StrAccum object.
**
** INPUTS:
** func This is a pointer to a function taking three arguments
** 1. A pointer to anything. Same as the "arg" parameter.
** 2. A pointer to the list of characters to be output
** (Note, this list is NOT null terminated.)
** 3. An integer number of characters to be output.
** (Note: This number might be zero.)
**
** arg This is the pointer to anything which will be passed as the
** first argument to "func". Use it for whatever you like.
**
** fmt This is the format string, as in the usual print.
**
** ap This is a pointer to a list of arguments. Same as in
** vfprint.
**
** OUTPUTS:
** The return value is the total number of characters sent to
** the function "func". Returns -1 on a error.
**
** Note that the order in which automatic variables are declared below
** seems to make a big difference in determining how fast this beast
** will run.
*/ */
void sqlite3VXPrintf( void sqlite3VXPrintf(
StrAccum *pAccum, /* Accumulate results here */ StrAccum *pAccum, /* Accumulate results here */
@@ -242,22 +180,22 @@ void sqlite3VXPrintf(
etByte flag_long; /* True if "l" flag is present */ etByte flag_long; /* True if "l" flag is present */
etByte flag_longlong; /* True if the "ll" flag is present */ etByte flag_longlong; /* True if the "ll" flag is present */
etByte done; /* Loop termination flag */ etByte done; /* Loop termination flag */
etByte xtype = 0; /* Conversion paradigm */
char prefix; /* Prefix character. "+" or "-" or " " or '\0'. */
sqlite_uint64 longvalue; /* Value for integer types */ sqlite_uint64 longvalue; /* Value for integer types */
LONGDOUBLE_TYPE realvalue; /* Value for real types */ LONGDOUBLE_TYPE realvalue; /* Value for real types */
const et_info *infop; /* Pointer to the appropriate info structure */ const et_info *infop; /* Pointer to the appropriate info structure */
char buf[etBUFSIZE]; /* Conversion buffer */
char *zOut; /* Rendering buffer */ char *zOut; /* Rendering buffer */
int nOut; /* Size of the rendering buffer */ int nOut; /* Size of the rendering buffer */
char prefix; /* Prefix character. "+" or "-" or " " or '\0'. */ char *zExtra; /* Malloced memory used by some conversion */
etByte xtype = 0; /* Conversion paradigm */
char *zExtra; /* Extra memory used for etTCLESCAPE conversions */
#ifndef SQLITE_OMIT_FLOATING_POINT #ifndef SQLITE_OMIT_FLOATING_POINT
int exp, e2; /* exponent of real numbers */ int exp, e2; /* exponent of real numbers */
int nsd; /* Number of significant digits returned */
double rounder; /* Used for rounding floating point values */ double rounder; /* Used for rounding floating point values */
etByte flag_dp; /* True if decimal point should be shown */ etByte flag_dp; /* True if decimal point should be shown */
etByte flag_rtz; /* True if trailing zeros should be removed */ etByte flag_rtz; /* True if trailing zeros should be removed */
int nsd; /* Number of significant digits returned */
#endif #endif
char buf[etBUFSIZE]; /* Conversion buffer */
length = 0; length = 0;
bufpt = 0; bufpt = 0;