@@ -612,37 +612,25 @@ add_parameters(PyObject *module)
612
612
return 0 ;
613
613
}
614
614
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
-
628
615
static inline int
629
616
add_vars_to_module (PyObject * module )
630
617
{
631
618
PyObject * obj ;
632
619
633
- /* zstd_version, a str. */
620
+ /* zstd_version, str */
634
621
if (PyModule_AddStringConstant (module , "zstd_version" ,
635
622
ZSTD_versionString ()) < 0 ) {
636
623
return -1 ;
637
624
}
638
625
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 );
643
631
return -1 ;
644
632
}
645
- Py_DECREF (obj );
633
+ Py_DECREF (vi );
646
634
647
635
/* Add zstd parameters */
648
636
if (add_parameters (module ) < 0 ) {
0 commit comments