gh-132983: Remove pyzstd in identifiers (#133535)

Rogdham · web-flow · commit 2cc6de77bdf0 · 2025-05-08T01:47:42.000+01:00
diff --git a/Modules/_zstd/_zstdmodule.h b/Modules/_zstd/_zstdmodule.h
@@ -172,19 +172,6 @@ set_parameter_error(const _zstd_state* const state, int is_compress,
 
 static const char init_twice_msg[] = "__init__ method is called twice.";
 
-extern int
-_PyZstd_load_c_dict(ZstdCompressor *self, PyObject *dict);
-
-extern int
-_PyZstd_load_d_dict(ZstdDecompressor *self, PyObject *dict);
-
-extern int
-_PyZstd_set_c_parameters(ZstdCompressor *self, PyObject *level_or_options,
-                         const char *arg_name, const char *arg_type);
-
-extern int
-_PyZstd_set_d_parameters(ZstdDecompressor *self, PyObject *options);
-
 extern PyObject *
 decompress_impl(ZstdDecompressor *self, ZSTD_inBuffer *in,
                 Py_ssize_t max_length,
diff --git a/Modules/_zstd/compressor.c b/Modules/_zstd/compressor.c
@@ -25,9 +25,9 @@ class _zstd.ZstdCompressor "ZstdCompressor *" "clinic_state()->ZstdCompressor_ty
 
 #define ZstdCompressor_CAST(op) ((ZstdCompressor *)op)
 
-int
-_PyZstd_set_c_parameters(ZstdCompressor *self, PyObject *level_or_options,
-                         const char *arg_name, const char* arg_type)
+static int
+_zstd_set_c_parameters(ZstdCompressor *self, PyObject *level_or_options,
+                       const char *arg_name, const char* arg_type)
 {
     size_t zstd_ret;
     _zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));
@@ -197,8 +197,8 @@ _get_CDict(ZstdDict *self, int compressionLevel)
     return cdict;
 }
 
-int
-_PyZstd_load_c_dict(ZstdCompressor *self, PyObject *dict) {
+static int
+_zstd_load_c_dict(ZstdCompressor *self, PyObject *dict) {
 
     size_t zstd_ret;
     _zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));
@@ -385,20 +385,20 @@ _zstd_ZstdCompressor___init___impl(ZstdCompressor *self, PyObject *level,
 
     /* Set compressLevel/options to compression context */
     if (level != Py_None) {
-        if (_PyZstd_set_c_parameters(self, level, "level", "int") < 0) {
+        if (_zstd_set_c_parameters(self, level, "level", "int") < 0) {
             return -1;
         }
     }
 
     if (options != Py_None) {
-        if (_PyZstd_set_c_parameters(self, options, "options", "dict") < 0) {
+        if (_zstd_set_c_parameters(self, options, "options", "dict") < 0) {
             return -1;
         }
     }
 
     /* Load dictionary to compression context */
     if (zstd_dict != Py_None) {
-        if (_PyZstd_load_c_dict(self, zstd_dict) < 0) {
+        if (_zstd_load_c_dict(self, zstd_dict) < 0) {
             return -1;
         }
 
diff --git a/Modules/_zstd/decompressor.c b/Modules/_zstd/decompressor.c
@@ -61,8 +61,8 @@ _get_DDict(ZstdDict *self)
 }
 
 /* Set decompression parameters to decompression context */
-int
-_PyZstd_set_d_parameters(ZstdDecompressor *self, PyObject *options)
+static int
+_zstd_set_d_parameters(ZstdDecompressor *self, PyObject *options)
 {
     size_t zstd_ret;
     PyObject *key, *value;
@@ -120,8 +120,8 @@ _PyZstd_set_d_parameters(ZstdDecompressor *self, PyObject *options)
 }
 
 /* Load dictionary or prefix to decompression context */
-int
-_PyZstd_load_d_dict(ZstdDecompressor *self, PyObject *dict)
+static int
+_zstd_load_d_dict(ZstdDecompressor *self, PyObject *dict)
 {
     size_t zstd_ret;
     _zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));
@@ -709,7 +709,7 @@ _zstd_ZstdDecompressor___init___impl(ZstdDecompressor *self,
 
     /* Load dictionary to decompression context */
     if (zstd_dict != Py_None) {
-        if (_PyZstd_load_d_dict(self, zstd_dict) < 0) {
+        if (_zstd_load_d_dict(self, zstd_dict) < 0) {
             return -1;
         }
 
@@ -720,7 +720,7 @@ _zstd_ZstdDecompressor___init___impl(ZstdDecompressor *self,
 
     /* Set option to decompression context */
     if (options != Py_None) {
-        if (_PyZstd_set_d_parameters(self, options) < 0) {
+        if (_zstd_set_d_parameters(self, options) < 0) {
             return -1;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ class _zstd.ZstdCompressor "ZstdCompressor *" "clinic_state()->ZstdCompressor_ty`
`25`	`25`
`26`	`26`	`#define ZstdCompressor_CAST(op) ((ZstdCompressor *)op)`
`27`	`27`
`28`		`-int`
`29`		`-_PyZstd_set_c_parameters(ZstdCompressor self, PyObject level_or_options,`
`30`		`- const char arg_name, const char arg_type)`
	`28`	`+static int`
	`29`	`+_zstd_set_c_parameters(ZstdCompressor self, PyObject level_or_options,`
	`30`	`+ const char arg_name, const char arg_type)`
`31`	`31`	`{`
`32`	`32`	`size_t zstd_ret;`
`33`	`33`	`_zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));`
`@@ -197,8 +197,8 @@ _get_CDict(ZstdDict *self, int compressionLevel)`
`197`	`197`	`return cdict;`
`198`	`198`	`}`
`199`	`199`
`200`		`-int`
`201`		`-_PyZstd_load_c_dict(ZstdCompressor self, PyObject dict) {`
	`200`	`+static int`
	`201`	`+_zstd_load_c_dict(ZstdCompressor self, PyObject dict) {`
`202`	`202`
`203`	`203`	`size_t zstd_ret;`
`204`	`204`	`_zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));`
`@@ -385,20 +385,20 @@ _zstd_ZstdCompressor___init___impl(ZstdCompressor self, PyObject level,`
`385`	`385`
`386`	`386`	`/* Set compressLevel/options to compression context */`
`387`	`387`	`if (level != Py_None) {`
`388`		`- if (_PyZstd_set_c_parameters(self, level, "level", "int") < 0) {`
	`388`	`+ if (_zstd_set_c_parameters(self, level, "level", "int") < 0) {`
`389`	`389`	`return -1;`
`390`	`390`	`}`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`if (options != Py_None) {`
`394`		`- if (_PyZstd_set_c_parameters(self, options, "options", "dict") < 0) {`
	`394`	`+ if (_zstd_set_c_parameters(self, options, "options", "dict") < 0) {`
`395`	`395`	`return -1;`
`396`	`396`	`}`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`/* Load dictionary to compression context */`
`400`	`400`	`if (zstd_dict != Py_None) {`
`401`		`- if (_PyZstd_load_c_dict(self, zstd_dict) < 0) {`
	`401`	`+ if (_zstd_load_c_dict(self, zstd_dict) < 0) {`
`402`	`402`	`return -1;`
`403`	`403`	`}`
`404`	`404`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ _get_DDict(ZstdDict *self)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/* Set decompression parameters to decompression context */`
`64`		`-int`
`65`		`-_PyZstd_set_d_parameters(ZstdDecompressor self, PyObject options)`
	`64`	`+static int`
	`65`	`+_zstd_set_d_parameters(ZstdDecompressor self, PyObject options)`
`66`	`66`	`{`
`67`	`67`	`size_t zstd_ret;`
`68`	`68`	`PyObject key, value;`
`@@ -120,8 +120,8 @@ _PyZstd_set_d_parameters(ZstdDecompressor self, PyObject options)`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/* Load dictionary or prefix to decompression context */`
`123`		`-int`
`124`		`-_PyZstd_load_d_dict(ZstdDecompressor self, PyObject dict)`
	`123`	`+static int`
	`124`	`+_zstd_load_d_dict(ZstdDecompressor self, PyObject dict)`
`125`	`125`	`{`
`126`	`126`	`size_t zstd_ret;`
`127`	`127`	`_zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));`
`@@ -709,7 +709,7 @@ _zstd_ZstdDecompressor___init___impl(ZstdDecompressor *self,`
`709`	`709`
`710`	`710`	`/* Load dictionary to decompression context */`
`711`	`711`	`if (zstd_dict != Py_None) {`
`712`		`- if (_PyZstd_load_d_dict(self, zstd_dict) < 0) {`
	`712`	`+ if (_zstd_load_d_dict(self, zstd_dict) < 0) {`
`713`	`713`	`return -1;`
`714`	`714`	`}`
`715`	`715`
`@@ -720,7 +720,7 @@ _zstd_ZstdDecompressor___init___impl(ZstdDecompressor *self,`
`720`	`720`
`721`	`721`	`/* Set option to decompression context */`
`722`	`722`	`if (options != Py_None) {`
`723`		`- if (_PyZstd_set_d_parameters(self, options) < 0) {`
	`723`	`+ if (_zstd_set_d_parameters(self, options) < 0) {`
`724`	`724`	`return -1;`
`725`	`725`	`}`
`726`	`726`	`}`