jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2460 from swig-fortran/remove-python-sprintf

Browse source 
[Python] Eliminate sprintf in generated code
This commit is contained in:
William S Fulton 2022-12-30 23:32:22 +00:00 • committed by GitHub
commit 223ddc4294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/python/pycontainer.swg
View file

@ -386,7 +386,7 @@ namespace swig {
size_t replacecount = (jj - ii + step - 1) / step; size_t replacecount = (jj - ii + step - 1) / step;
if (is.size() != replacecount) { if (is.size() != replacecount) {
char msg[1024]; char msg[1024];
sprintf(msg, "attempt to assign sequence of size %lu to extended slice of size %lu", (unsigned long)is.size(), (unsigned long)replacecount); PyOS_snprintf(msg, sizeof(msg), "attempt to assign sequence of size %lu to extended slice of size %lu", (unsigned long)is.size(), (unsigned long)replacecount);
throw std::invalid_argument(msg); throw std::invalid_argument(msg);
} }
typename Sequence::const_iterator isit = is.begin(); typename Sequence::const_iterator isit = is.begin();
@ -402,7 +402,7 @@ namespace swig {
size_t replacecount = (ii - jj - step - 1) / -step; size_t replacecount = (ii - jj - step - 1) / -step;
if (is.size() != replacecount) { if (is.size() != replacecount) {
char msg[1024]; char msg[1024];
sprintf(msg, "attempt to assign sequence of size %lu to extended slice of size %lu", (unsigned long)is.size(), (unsigned long)replacecount); PyOS_snprintf(msg, sizeof(msg), "attempt to assign sequence of size %lu to extended slice of size %lu", (unsigned long)is.size(), (unsigned long)replacecount);
throw std::invalid_argument(msg); throw std::invalid_argument(msg);
} }
typename Sequence::const_iterator isit = is.begin(); typename Sequence::const_iterator isit = is.begin();
@ -478,7 +478,7 @@ namespace swig
return swig::as<T>(item); return swig::as<T>(item);
} catch (const std::invalid_argument& e) { } catch (const std::invalid_argument& e) {
char msg[1024]; char msg[1024];
sprintf(msg, "in sequence element %d ", (int)_index); PyOS_snprintf(msg, sizeof(msg), "in sequence element %d ", (int)_index);
if (!PyErr_Occurred()) { if (!PyErr_Occurred()) {
::%type_error(swig::type_name<T>()); ::%type_error(swig::type_name<T>());
} }