StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

use nullptr instead of NULL, fix warning from storing string literal as non-const

Browse Source
This commit is contained in:
Thomas Fussell 2017-07-03 06:06:21 -07:00
parent 2aeec48b73
commit f9c17bf075
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arrow/xlntpyarrow/xlntpyarrow.cpp
View File

@ -30,12 +30,13 @@ Returns an arrow table representing the given XLSX file object.");
PyObject *xlntpyarrow_xlsx2arrow(PyObject *self, PyObject *args, PyObject *kwargs) PyObject *xlntpyarrow_xlsx2arrow(PyObject *self, PyObject *args, PyObject *kwargs)
{ {
PyObject *file = NULL; PyObject *file = nullptr;
static char* keywords[] = { "file", NULL }; static auto keywords = { "file", nullptr };
static auto keywords_nc = const_cast<char **>(keywords);
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O", keywords, &file)) if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O", keywords_nc, &file))
{ {
return NULL; return nullptr;
} }
return xlsx2arrow(file); return xlsx2arrow(file);
@ -51,12 +52,13 @@ Writes the given arrow table to out_file as an XLSX file.");
PyObject *xlntpyarrow_arrow2xlsx(PyObject *self, PyObject *args, PyObject *kwargs) PyObject *xlntpyarrow_arrow2xlsx(PyObject *self, PyObject *args, PyObject *kwargs)
{ {
PyObject *obj = NULL; PyObject *obj = nullptr;
static char* keywords[] = { "obj", NULL }; static auto keywords = { "file", nullptr };
static auto keywords_nc = const_cast<char **>(keywords);
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi", keywords, &obj)) if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi", keywords_nc, &obj))
{ {
return NULL; return nulllptr;
} }
Py_RETURN_NONE; Py_RETURN_NONE;
@ -66,7 +68,7 @@ static PyMethodDef xlntpyarrow_functions[] =
{ {
{ "xlsx2arrow", (PyCFunction)xlntpyarrow_xlsx2arrow, METH_VARARGS | METH_KEYWORDS, xlntpyarrow_xlsx2arrow_doc }, { "xlsx2arrow", (PyCFunction)xlntpyarrow_xlsx2arrow, METH_VARARGS | METH_KEYWORDS, xlntpyarrow_xlsx2arrow_doc },
{ "arrow2xlsx", (PyCFunction)xlntpyarrow_arrow2xlsx, METH_VARARGS | METH_KEYWORDS, xlntpyarrow_arrow2xlsx_doc }, { "arrow2xlsx", (PyCFunction)xlntpyarrow_arrow2xlsx, METH_VARARGS | METH_KEYWORDS, xlntpyarrow_arrow2xlsx_doc },
{ NULL, NULL, 0, NULL } /* marks end of array */ { nullptr, nullptr, 0, nullptr }
}; };
int exec_xlntpyarrow(PyObject *module) int exec_xlntpyarrow(PyObject *module)
@ -85,7 +87,7 @@ PyDoc_STRVAR(xlntpyarrow_doc, "The xlntpyarrow module");
static PyModuleDef_Slot xlntpyarrow_slots[] = static PyModuleDef_Slot xlntpyarrow_slots[] =
{ {
{ Py_mod_exec, (void *)exec_xlntpyarrow }, { Py_mod_exec, (void *)exec_xlntpyarrow },
{ 0, NULL } { 0, nullptr }
}; };
static PyModuleDef xlntpyarrow_def = static PyModuleDef xlntpyarrow_def =
@ -94,11 +96,11 @@ static PyModuleDef xlntpyarrow_def =
"xlntpyarrow", "xlntpyarrow",
xlntpyarrow_doc, xlntpyarrow_doc,
0, /* m_size */ 0, /* m_size */
NULL, /* m_methods */ nullptr, /* m_methods */
xlntpyarrow_slots, xlntpyarrow_slots,
NULL, /* m_traverse */ nullptr, /* m_traverse */
NULL, /* m_clear */ nullptr, /* m_clear */
NULL, /* m_free */ nullptr, /* m_free */
}; };
PyMODINIT_FUNC PyInit_xlntpyarrow() PyMODINIT_FUNC PyInit_xlntpyarrow()