diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-03 11:29:38 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-05-12 18:43:07 +0200 |
| commit | ff2b896edd9df9ce04e572e6bd569f51cc4b500e (patch) | |
| tree | 4ce62c971c643cc4e743cf4a8ae2fd9dea98b7ac | |
| parent | 74e2d6e786974e161949bf49a60404c358d1ecd7 (diff) | |
| download | samba-ff2b896edd9df9ce04e572e6bd569f51cc4b500e.tar.gz samba-ff2b896edd9df9ce04e572e6bd569f51cc4b500e.tar.xz samba-ff2b896edd9df9ce04e572e6bd569f51cc4b500e.zip | |
pytdb: avoid const warnings by using discard_const_p()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | lib/tdb/pytdb.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c index bf0fed6e7b..93207992cb 100644 --- a/lib/tdb/pytdb.c +++ b/lib/tdb/pytdb.c @@ -91,9 +91,10 @@ static PyObject *py_tdb_open(PyTypeObject *type, PyObject *args, PyObject *kwarg int hash_size = 0, tdb_flags = TDB_DEFAULT, flags = O_RDWR, mode = 0600; TDB_CONTEXT *ctx; PyTdbObject *ret; - const char *kwnames[] = { "name", "hash_size", "tdb_flags", "flags", "mode", NULL }; + const char *_kwnames[] = { "name", "hash_size", "tdb_flags", "flags", "mode", NULL }; + char **kwnames = discard_const_p(char *, _kwnames); - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|siiii", (char **)kwnames, &name, &hash_size, &tdb_flags, &flags, &mode)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|siiii", kwnames, &name, &hash_size, &tdb_flags, &flags, &mode)) return NULL; if (name == NULL) { @@ -548,13 +549,21 @@ static PyObject *obj_get_seqnum(PyTdbObject *self, void *closure) static PyGetSetDef tdb_object_getsetters[] = { - { (char *)"hash_size", (getter)obj_get_hash_size, NULL, NULL }, - { (char *)"map_size", (getter)obj_get_map_size, NULL, NULL }, - { (char *)"freelist_size", (getter)obj_get_freelist_size, NULL, NULL }, - { (char *)"flags", (getter)obj_get_flags, NULL, NULL }, - { (char *)"max_dead", NULL, (setter)obj_set_max_dead, NULL }, - { (char *)"filename", (getter)obj_get_filename, NULL, (char *)"The filename of this TDB file."}, - { (char *)"seqnum", (getter)obj_get_seqnum, NULL, NULL }, + { discard_const_p(char, "hash_size"), + (getter)obj_get_hash_size, NULL, NULL }, + { discard_const_p(char, "map_size"), + (getter)obj_get_map_size, NULL, NULL }, + { discard_const_p(char, "freelist_size"), + (getter)obj_get_freelist_size, NULL, NULL }, + { discard_const_p(char, "flags"), + (getter)obj_get_flags, NULL, NULL }, + { discard_const_p(char, "max_dead"), + NULL, (setter)obj_set_max_dead, NULL }, + { discard_const_p(char, "filename"), + (getter)obj_get_filename, NULL, + discard_const_p(char, "The filename of this TDB file.") }, + { discard_const_p(char, "seqnum"), + (getter)obj_get_seqnum, NULL, NULL }, { NULL } }; |