Snapshot regression

Reverted changes to the `sip` module sources so that they build using MSVC.
Python-SIP · Dec 5, 2024 · 0e02efe · 0e02efe
1 parent 93369f6
commit 0e02efe
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/sipbuild/module/source/12/siplib.c b/sipbuild/module/source/12/siplib.c
@@ -7776,32 +7776,35 @@ static void sip_api_abstract_method(const char *classname, const char *method)
             classname, method);
 }
 
+
 /*
  * Report a deprecated class or method.
  */
 int sip_api_deprecated(const char *classname, const char *method)
 {
-  return sip_api_deprecated_12_16( classname, method, NULL );
+  return sip_api_deprecated_12_16(classname, method, NULL);
 }
 
+
 /*
- * Report a deprecated class or method with a given message.
+ * Report a deprecated class or method with an optional message.
  */
-int sip_api_deprecated_12_16(const char *classname, const char *method, const char *message)
+int sip_api_deprecated_12_16(const char *classname, const char *method,
+        const char *message)
 {
-    const unsigned int bufsize = 100 + ( message ? strlen(message) : 0 );
-    char buf[bufsize];
+    char buf[100];
 
     if (classname == NULL)
         PyOS_snprintf(buf, sizeof (buf), "%s() is deprecated", method);
     else if (method == NULL)
         PyOS_snprintf(buf, sizeof (buf), "%s constructor is deprecated",
                 classname);
     else
-        PyOS_snprintf(buf, sizeof (buf), "%s.%s() is deprecated", classname, method);
+        PyOS_snprintf(buf, sizeof (buf), "%s.%s() is deprecated", classname,
+                method);
 
     if (message != NULL)
-      PyOS_snprintf(&buf[strlen(buf)], sizeof (buf), ": %s", message);
+        PyOS_snprintf(&buf[strlen(buf)], sizeof (buf), ": %s", message);
 
     return PyErr_WarnEx(PyExc_DeprecationWarning, buf, 1);
 }

diff --git a/sipbuild/module/source/13/sip_core.c b/sipbuild/module/source/13/sip_core.c
@@ -6661,32 +6661,35 @@ static void sip_api_abstract_method(const char *classname, const char *method)
             classname, method);
 }
 
+
 /*
  * Report a deprecated class or method.
  */
 int sip_api_deprecated(const char *classname, const char *method)
 {
-  return sip_api_deprecated_13_9( classname, method, NULL );
+    return sip_api_deprecated_13_9(classname, method, NULL);
 }
 
+
 /*
- * Report a deprecated class or method with a given message.
+ * Report a deprecated class or method with an optional message.
  */
-int sip_api_deprecated_13_9(const char *classname, const char *method, const char *message)
+int sip_api_deprecated_13_9(const char *classname, const char *method,
+        const char *message)
 {
-    const unsigned int bufsize = 100 + ( message ? strlen(message) : 0 );
-    char buf[bufsize];
+    char buf[100];
 
     if (classname == NULL)
         PyOS_snprintf(buf, sizeof (buf), "%s() is deprecated", method);
     else if (method == NULL)
         PyOS_snprintf(buf, sizeof (buf), "%s constructor is deprecated",
                 classname);
     else
-      PyOS_snprintf(buf, sizeof (buf), "%s.%s() is deprecated", classname, method );
+        PyOS_snprintf(buf, sizeof (buf), "%s.%s() is deprecated", classname,
+                method );
 
     if (message != NULL)
-      PyOS_snprintf(&buf[strlen(buf)], sizeof (buf), ": %s", message);
+        PyOS_snprintf(&buf[strlen(buf)], sizeof (buf), ": %s", message);
 
     return PyErr_WarnEx(PyExc_DeprecationWarning, buf, 1);
 }