mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

More unconsting.

Browse source
This commit is contained in:
Martin v. Löwis 2006-02-27 17:20:04 +00:00
parent f4e6928c4d
commit 02cbf4ae4b
9 changed files with 56 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Modules/_bsddb.c
View file

@ -651,7 +651,7 @@ static PyObject* _DBCursor_get(DBCursorObject* self, int extra_flags,
int dlen = -1;
int doff = -1;
int flags = 0;
static const char* kwnames[] = { "flags", "dlen", "doff", NULL };
static char* kwnames[] = { "flags", "dlen", "doff", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, format, kwnames,
&flags, &dlen, &doff))
@ -1150,10 +1150,10 @@ DB_associate(DBObject* self, PyObject* args, PyObject* kwargs)
#if (DBVER >= 41)
PyObject *txnobj = NULL;
DB_TXN *txn = NULL;
static const char* kwnames[] = {"secondaryDB", "callback", "flags", "txn",
static char* kwnames[] = {"secondaryDB", "callback", "flags", "txn",
NULL};
#else
static const char* kwnames[] = {"secondaryDB", "callback", "flags", NULL};
static char* kwnames[] = {"secondaryDB", "callback", "flags", NULL};
#endif
#if (DBVER >= 41)
@ -1259,7 +1259,7 @@ _DB_consume(DBObject* self, PyObject* args, PyObject* kwargs, int consume_flag)
PyObject* retval = NULL;
DBT key, data;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "txn", "flags", NULL };
static char* kwnames[] = { "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:consume", kwnames,
&txnobj, &flags))
@ -1329,7 +1329,7 @@ DB_cursor(DBObject* self, PyObject* args, PyObject* kwargs)
DBC* dbc;
PyObject* txnobj = NULL;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "txn", "flags", NULL };
static char* kwnames[] = { "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
&txnobj, &flags))
@ -1354,7 +1354,7 @@ DB_delete(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* keyobj;
DBT key;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "key", "txn", "flags", NULL };
static char* kwnames[] = { "key", "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:delete", kwnames,
&keyobj, &txnobj, &flags))
@ -1406,7 +1406,7 @@ DB_get(DBObject* self, PyObject* args, PyObject* kwargs)
int doff = -1;
DBT key, data;
DB_TXN *txn = NULL;
static const char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
static char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
"doff", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:get", kwnames,
@ -1474,7 +1474,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
int doff = -1;
DBT key, pkey, data;
DB_TXN *txn = NULL;
static const char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
static char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
"doff", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:pget", kwnames,
@ -1572,7 +1572,7 @@ DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* retval = NULL;
DBT key, data;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "key", "txn", NULL };
static char* kwnames[] = { "key", "txn", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:get_size", kwnames,
&keyobj, &txnobj))
@ -1615,7 +1615,7 @@ DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* retval = NULL;
DBT key, data;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "key", "data", "txn", "flags", NULL };
static char* kwnames[] = { "key", "data", "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oi:get_both", kwnames,
@ -1766,7 +1766,7 @@ DB_key_range(DBObject* self, PyObject* args, PyObject* kwargs)
DBT key;
DB_TXN *txn = NULL;
DB_KEY_RANGE range;
static const char* kwnames[] = { "key", "txn", "flags", NULL };
static char* kwnames[] = { "key", "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:key_range", kwnames,
&keyobj, &txnobj, &flags))
@ -1797,17 +1797,17 @@ DB_open(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject *txnobj = NULL;
DB_TXN *txn = NULL;
/* with dbname */
static const char* kwnames[] = {
static char* kwnames[] = {
"filename", "dbname", "dbtype", "flags", "mode", "txn", NULL};
/* without dbname */
static const char* kwnames_basic[] = {
"filename", "dbtype", "flags", "mode", "txn", NULL};
#else
/* with dbname */
static const char* kwnames[] = {
static char* kwnames[] = {
"filename", "dbname", "dbtype", "flags", "mode", NULL};
/* without dbname */
static const char* kwnames_basic[] = {
static char* kwnames_basic[] = {
"filename", "dbtype", "flags", "mode", NULL};
#endif
@ -1891,7 +1891,7 @@ DB_put(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* keyobj, *dataobj, *retval;
DBT key, data;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
static char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
"doff", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oiii:put", kwnames,
@ -1932,7 +1932,7 @@ DB_remove(DBObject* self, PyObject* args, PyObject* kwargs)
char* filename;
char* database = NULL;
int err, flags=0;
static const char* kwnames[] = { "filename", "dbname", "flags", NULL};
static char* kwnames[] = { "filename", "dbname", "flags", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zi:remove", kwnames,
&filename, &database, &flags))
@ -2350,9 +2350,9 @@ DB_stat(DBObject* self, PyObject* args, PyObject* kwargs)
#if (DBVER >= 43)
PyObject* txnobj = NULL;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "txn", "flags", NULL };
static char* kwnames[] = { "txn", "flags", NULL };
#else
static const char* kwnames[] = { "flags", NULL };
static char* kwnames[] = { "flags", NULL };
#endif
#if (DBVER >= 43)
@ -2492,7 +2492,7 @@ DB_truncate(DBObject* self, PyObject* args, PyObject* kwargs)
u_int32_t count=0;
PyObject* txnobj = NULL;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "txn", "flags", NULL };
static char* kwnames[] = { "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
&txnobj, &flags))
@ -2536,7 +2536,7 @@ DB_verify(DBObject* self, PyObject* args, PyObject* kwargs)
char* dbName=NULL;
char* outFileName=NULL;
FILE* outFile=NULL;
static const char* kwnames[] = { "filename", "dbname", "outfile", "flags",
static char* kwnames[] = { "filename", "dbname", "outfile", "flags",
NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zzi:verify", kwnames,
@ -2594,7 +2594,7 @@ DB_set_encrypt(DBObject* self, PyObject* args, PyObject* kwargs)
int err;
u_int32_t flags=0;
char *passwd = NULL;
static const char* kwnames[] = { "passwd", "flags", NULL };
static char* kwnames[] = { "passwd", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
&passwd, &flags)) {
@ -3034,7 +3034,7 @@ DBC_get(DBCursorObject* self, PyObject* args, PyObject *kwargs)
int dlen = -1;
int doff = -1;
DBT key, data;
static const char* kwnames[] = { "key","data", "flags", "dlen", "doff",
static char* kwnames[] = { "key","data", "flags", "dlen", "doff",
NULL };
CLEAR_DBT(key);
@ -3121,7 +3121,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
int dlen = -1;
int doff = -1;
DBT key, pkey, data;
static const char* kwnames[] = { "key","data", "flags", "dlen", "doff",
static char* kwnames[] = { "key","data", "flags", "dlen", "doff",
NULL };
CLEAR_DBT(key);
@ -3283,7 +3283,7 @@ DBC_put(DBCursorObject* self, PyObject* args, PyObject* kwargs)
int err, flags = 0;
PyObject* keyobj, *dataobj;
DBT key, data;
static const char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
static char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
NULL };
int dlen = -1;
int doff = -1;
@ -3319,7 +3319,7 @@ DBC_set(DBCursorObject* self, PyObject* args, PyObject *kwargs)
int err, flags = 0;
DBT key, data;
PyObject* retval, *keyobj;
static const char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
int dlen = -1;
int doff = -1;
@ -3389,7 +3389,7 @@ DBC_set_range(DBCursorObject* self, PyObject* args, PyObject* kwargs)
int err, flags = 0;
DBT key, data;
PyObject* retval, *keyobj;
static const char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
int dlen = -1;
int doff = -1;
@ -3579,7 +3579,7 @@ DBC_set_recno(DBCursorObject* self, PyObject* args, PyObject *kwargs)
PyObject* retval;
int dlen = -1;
int doff = -1;
static const char* kwnames[] = { "recno","flags", "dlen", "doff", NULL };
static char* kwnames[] = { "recno","flags", "dlen", "doff", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|iii:set_recno", kwnames,
&irecno, &flags, &dlen, &doff))
@ -3773,7 +3773,7 @@ DBEnv_dbremove(DBEnvObject* self, PyObject* args, PyObject* kwargs)
char *database = NULL;
PyObject *txnobj = NULL;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "file", "database", "txn", "flags",
static char* kwnames[] = { "file", "database", "txn", "flags",
NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss|Oi:dbremove", kwnames,
@ -3801,7 +3801,7 @@ DBEnv_dbrename(DBEnvObject* self, PyObject* args, PyObject* kwargs)
char *newname = NULL;
PyObject *txnobj = NULL;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "file", "database", "newname", "txn",
static char* kwnames[] = { "file", "database", "newname", "txn",
"flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss|Oi:dbrename", kwnames,
@ -3826,7 +3826,7 @@ DBEnv_set_encrypt(DBEnvObject* self, PyObject* args, PyObject* kwargs)
int err;
u_int32_t flags=0;
char *passwd = NULL;
static const char* kwnames[] = { "passwd", "flags", NULL };
static char* kwnames[] = { "passwd", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
&passwd, &flags)) {
@ -3849,7 +3849,7 @@ DBEnv_set_timeout(DBEnvObject* self, PyObject* args, PyObject* kwargs)
int err;
u_int32_t flags=0;
u_int32_t timeout = 0;
static const char* kwnames[] = { "timeout", "flags", NULL };
static char* kwnames[] = { "timeout", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:set_timeout", kwnames,
&timeout, &flags)) {
@ -4136,7 +4136,7 @@ DBEnv_txn_begin(DBEnvObject* self, PyObject* args, PyObject* kwargs)
int flags = 0;
PyObject* txnobj = NULL;
DB_TXN *txn = NULL;
static const char* kwnames[] = { "parent", "flags", NULL };
static char* kwnames[] = { "parent", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:txn_begin", kwnames,
&txnobj, &flags))
@ -4986,7 +4986,7 @@ DB_construct(PyObject* self, PyObject* args, PyObject* kwargs)
{
PyObject* dbenvobj = NULL;
int flags = 0;
static const char* kwnames[] = { "dbEnv", "flags", NULL};
static char* kwnames[] = { "dbEnv", "flags", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:DB", kwnames,
&dbenvobj, &flags))