Skip to content

Commit 8614ad8

Browse files
committed
zstd: Simplify version_info setup
1 parent f6d2a4e commit 8614ad8

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

Modules/_zstd/_zstdmodule.c

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -612,37 +612,25 @@ add_parameters(PyObject *module)
612612
return 0;
613613
}
614614

615-
static inline PyObject *
616-
get_zstd_version_info(void)
617-
{
618-
uint32_t ver = ZSTD_versionNumber();
619-
uint32_t major, minor, release;
620-
621-
major = ver / 10000;
622-
minor = (ver / 100) % 100;
623-
release = ver % 100;
624-
625-
return Py_BuildValue("III", major, minor, release);
626-
}
627-
628615
static inline int
629616
add_vars_to_module(PyObject *module)
630617
{
631618
PyObject *obj;
632619

633-
/* zstd_version, a str. */
620+
/* zstd_version, str */
634621
if (PyModule_AddStringConstant(module, "zstd_version",
635622
ZSTD_versionString()) < 0) {
636623
return -1;
637624
}
638625

639-
/* zstd_version_info, a tuple. */
640-
obj = get_zstd_version_info();
641-
if (PyModule_AddObjectRef(module, "zstd_version_info", obj) < 0) {
642-
Py_XDECREF(obj);
626+
/* zstd_version_info, tuple of (int, int, int) */
627+
PyObject *vi = Py_BuildValue("BBB", ZSTD_VERSION_MAJOR, ZSTD_VERSION_MINOR,
628+
ZSTD_VERSION_RELEASE);
629+
if (PyModule_AddObjectRef(module, "zstd_version_info", vi) < 0) {
630+
Py_XDECREF(vi);
643631
return -1;
644632
}
645-
Py_DECREF(obj);
633+
Py_DECREF(vi);
646634

647635
/* Add zstd parameters */
648636
if (add_parameters(module) < 0) {

0 commit comments

Comments
 (0)