1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More sprintf -> PyOS_snprintf.

Browse Source
This commit is contained in:
Tim Peters 2001-11-28 22:07:30 +00:00
parent 179c48c60e
commit 75cdad5584
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/almodule.c
View File

@ -1519,7 +1519,8 @@ al_GetParams(PyObject *self, PyObject *args)
for (i = 0; i < npvs; i++) { for (i = 0; i < npvs; i++) {
if (pvs[i].sizeOut < 0) { if (pvs[i].sizeOut < 0) {
char buf[32]; char buf[32];
sprintf(buf, "problem with param %d", i); PyOS_snprintf(buf, sizeof(buf),
"problem with param %d", i);
PyErr_SetString(ErrorObject, buf); PyErr_SetString(ErrorObject, buf);
goto error; goto error;
} }

6
Modules/posixmodule.c
View File

@ -2555,7 +2555,7 @@ _PyPopenCreateProcess(char *cmdstring,
x = i + strlen(s3) + strlen(cmdstring) + 1; x = i + strlen(s3) + strlen(cmdstring) + 1;
s2 = (char *)_alloca(x); s2 = (char *)_alloca(x);
ZeroMemory(s2, x); ZeroMemory(s2, x);
sprintf(s2, "%s%s%s", s1, s3, cmdstring); PyOS_snprintf(s2, x, "%s%s%s", s1, s3, cmdstring);
} }
else { else {
/* /*
@ -2608,8 +2608,8 @@ _PyPopenCreateProcess(char *cmdstring,
s2 = (char *)_alloca(x); s2 = (char *)_alloca(x);
ZeroMemory(s2, x); ZeroMemory(s2, x);
sprintf( PyOS_snprintf(
s2, s2, x,
"%s \"%s%s%s\"", "%s \"%s%s%s\"",
modulepath, modulepath,
s1, s1,

3
Modules/socketmodule.c
View File

@ -3089,7 +3089,8 @@ OS2init(void)
return 1; /* Indicate Success */ return 1; /* Indicate Success */
} }
sprintf(reason, "OS/2 TCP/IP Error# %d", sock_errno()); PyOS_snprintf(reason, sizeof(reason),
"OS/2 TCP/IP Error# %d", sock_errno());
PyErr_SetString(PyExc_ImportError, reason); PyErr_SetString(PyExc_ImportError, reason);
return 0; /* Indicate Failure */ return 0; /* Indicate Failure */

6
Modules/stropmodule.c
View File

@ -778,7 +778,8 @@ strop_atoi(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
else if (errno != 0) { else if (errno != 0) {
sprintf(buffer, "atoi() literal too large: %.200s", s); PyOS_snprintf(buffer, sizeof(buffer),
"atoi() literal too large: %.200s", s);
PyErr_SetString(PyExc_ValueError, buffer); PyErr_SetString(PyExc_ValueError, buffer);
return NULL; return NULL;
} }
@ -828,7 +829,8 @@ strop_atol(PyObject *self, PyObject *args)
while (*end && isspace(Py_CHARMASK(*end))) while (*end && isspace(Py_CHARMASK(*end)))
end++; end++;
if (*end != '\0') { if (*end != '\0') {
sprintf(buffer, "invalid literal for atol(): %.200s", s); PyOS_snprintf(buffer, sizeof(buffer),
"invalid literal for atol(): %.200s", s);
PyErr_SetString(PyExc_ValueError, buffer); PyErr_SetString(PyExc_ValueError, buffer);
Py_DECREF(x); Py_DECREF(x);
return NULL; return NULL;

5
Python/thread_beos.h
View File

@ -123,7 +123,8 @@ long PyThread_start_new_thread( void (*func)(void *), void *arg )
/* We are so very thread-safe... */ /* We are so very thread-safe... */
this_thread = atomic_add( &thread_count, 1 ); this_thread = atomic_add( &thread_count, 1 );
sprintf( name, "python thread (%d)", this_thread ); PyOS_snprintf(name, sizeof(name),
"python thread (%d)", this_thread );
tid = spawn_thread( (thread_func)func, name, tid = spawn_thread( (thread_func)func, name,
B_NORMAL_PRIORITY, arg ); B_NORMAL_PRIORITY, arg );
@ -222,7 +223,7 @@ PyThread_type_lock PyThread_allocate_lock( void )
} }
this_lock = atomic_add( &lock_count, 1 ); this_lock = atomic_add( &lock_count, 1 );
sprintf( name, "python lock (%d)", this_lock ); PyOS_snprintf(name, sizeof(name), "python lock (%d)", this_lock);
retval = benaphore_create( name, lock ); retval = benaphore_create( name, lock );
if( retval != EOK ) { if( retval != EOK ) {