Skip to content

Commit 8fb350d

Browse files
sobolevnsobolevn
committed
Use PyOS_snprintf 
1 parent b33fb2d commit 8fb350d

File tree

9 files changed

+29
-27
lines changed

9 files changed

+29
-27
lines changed

‎Modules/_datetimemodule.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,13 +1559,13 @@ make_freplacement(PyObject *object)
15591559
{
15601560
char freplacement[64];
15611561
if (PyTime_Check(object))
1562-
snprintf(freplacement, sizeof(freplacement),
1563-
"%06d", TIME_GET_MICROSECOND(object));
1562+
PyOS_snprintf(freplacement, sizeof(freplacement),
1563+
"%06d", TIME_GET_MICROSECOND(object));
15641564
else if (PyDateTime_Check(object))
1565-
snprintf(freplacement, sizeof(freplacement),
1566-
"%06d", DATE_GET_MICROSECOND(object));
1565+
PyOS_snprintf(freplacement, sizeof(freplacement),
1566+
"%06d", DATE_GET_MICROSECOND(object));
15671567
else
1568-
snprintf(freplacement, sizeof(freplacement), "%06d", 0);
1568+
PyOS_snprintf(freplacement, sizeof(freplacement), "%06d", 0);
15691569

15701570
return PyBytes_FromStringAndSize(freplacement, strlen(freplacement));
15711571
}

‎Modules/_pickle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2098,7 +2098,7 @@ save_long(PicklerObject *self, PyObject *obj)
20982098
}
20992099
}
21002100
else {
2101-
snprintf(pdata, sizeof(pdata), "%c%ld\n", INT, val);
2101+
PyOS_snprintf(pdata, sizeof(pdata), "%c%ld\n", INT, val);
21022102
len = strlen(pdata);
21032103
}
21042104
if (_Pickler_Write(self, pdata, len) < 0)

‎Modules/_ssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,7 @@ _get_peer_alt_names (_sslmodulestate *state, X509 *certificate) {
13241324
} else if (name->d.ip->length == 16) {
13251325
/* PyUnicode_FromFormat() does not support %X */
13261326
unsigned char *p = name->d.ip->data;
1327-
len = snprintf(
1327+
len = PyOS_snprintf(
13281328
buf,
13291329
sizeof(buf),
13301330
"%X:%X:%X:%X:%X:%X:%X:%X",

‎Modules/_testcapimodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@ test_capsule(PyObject *self, PyObject *Py_UNUSED(ignored))
10971097
#undef FAIL
10981098
#define FAIL(x) \
10991099
{ \
1100-
snprintf(buffer, sizeof(buffer), \
1100+
PyOS_snprintf(buffer, sizeof(buffer), \
11011101
"%s module: \"%s\" attribute: \"%s\"", \
11021102
x, known->module, known->attribute); \
11031103
error = buffer; \

‎Modules/getnameinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
139139
if (serv == NULL || servlen == 0) {
140140
/* what we should do? */
141141
} else if (flags & NI_NUMERICSERV) {
142-
snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
142+
PyOS_snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
143143
if (strlen(numserv) > servlen)
144144
return ENI_MEMORY;
145145
strcpy(serv, numserv);

‎Modules/socketmodule.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,11 +1302,11 @@ makebdaddr(bdaddr_t *bdaddr)
13021302
octets[i] = ((*bdaddr) >> (8 * i)) & 0xFF;
13031303
}
13041304

1305-
snprintf(buf, sizeof(buf), "%02X:%02X:%02X:%02X:%02X:%02X",
1305+
PyOS_snprintf(buf, sizeof(buf), "%02X:%02X:%02X:%02X:%02X:%02X",
13061306
octets[5], octets[4], octets[3],
13071307
octets[2], octets[1], octets[0]);
13081308
#else
1309-
snprintf(buf, sizeof(buf), "%02X:%02X:%02X:%02X:%02X:%02X",
1309+
PyOS_snprintf(buf, sizeof(buf), "%02X:%02X:%02X:%02X:%02X:%02X",
13101310
bdaddr->b[5], bdaddr->b[4], bdaddr->b[3],
13111311
bdaddr->b[2], bdaddr->b[1], bdaddr->b[0]);
13121312
#endif

‎Objects/bytesobject.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -270,43 +270,45 @@ PyBytes_FromFormatV(const char *format, va_list vargs)
270270

271271
case 'd':
272272
if (longflag) {
273-
snprintf(buffer, sizeof(buffer), "%ld", va_arg(vargs, long));
273+
PyOS_snprintf(buffer, sizeof(buffer),
274+
"%ld", va_arg(vargs, long));
274275
}
275276
else if (size_tflag) {
276-
snprintf(buffer, sizeof(buffer),
277-
"%zd", va_arg(vargs, Py_ssize_t));
277+
PyOS_snprintf(buffer, sizeof(buffer),
278+
"%zd", va_arg(vargs, Py_ssize_t));
278279
}
279280
else {
280-
snprintf(buffer, sizeof(buffer), "%d", va_arg(vargs, int));
281+
PyOS_snprintf(buffer, sizeof(buffer), "%d", va_arg(vargs, int));
281282
}
282283
assert(strlen(buffer) < sizeof(buffer));
283284
WRITE_BYTES(buffer);
284285
break;
285286

286287
case 'u':
287288
if (longflag) {
288-
snprintf(buffer, sizeof(buffer),
289-
"%lu", va_arg(vargs, unsigned long));
289+
PyOS_snprintf(buffer, sizeof(buffer),
290+
"%lu", va_arg(vargs, unsigned long));
290291
}
291292
else if (size_tflag) {
292-
snprintf(buffer, sizeof(buffer), "%zu", va_arg(vargs, size_t));
293+
PyOS_snprintf(buffer, sizeof(buffer),
294+
"%zu", va_arg(vargs, size_t));
293295
}
294296
else {
295-
snprintf(buffer, sizeof(buffer),
296-
"%u", va_arg(vargs, unsigned int));
297+
PyOS_snprintf(buffer, sizeof(buffer),
298+
"%u", va_arg(vargs, unsigned int));
297299
}
298300
assert(strlen(buffer) < sizeof(buffer));
299301
WRITE_BYTES(buffer);
300302
break;
301303

302304
case 'i':
303-
snprintf(buffer, sizeof(buffer), "%i", va_arg(vargs, int));
305+
PyOS_snprintf(buffer, sizeof(buffer), "%i", va_arg(vargs, int));
304306
assert(strlen(buffer) < sizeof(buffer));
305307
WRITE_BYTES(buffer);
306308
break;
307309

308310
case 'x':
309-
snprintf(buffer, sizeof(buffer), "%x", va_arg(vargs, int));
311+
PyOS_snprintf(buffer, sizeof(buffer), "%x", va_arg(vargs, int));
310312
assert(strlen(buffer) < sizeof(buffer));
311313
WRITE_BYTES(buffer);
312314
break;
@@ -332,7 +334,7 @@ PyBytes_FromFormatV(const char *format, va_list vargs)
332334
}
333335

334336
case 'p':
335-
snprintf(buffer, sizeof(buffer), "%p", va_arg(vargs, void*));
337+
PyOS_snprintf(buffer, sizeof(buffer), "%p", va_arg(vargs, void*));
336338
assert(strlen(buffer) < sizeof(buffer));
337339
/* %p is ill-defined: ensure leading 0x. */
338340
if (buffer[1] == 'X')

‎Objects/typeobject.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4730,9 +4730,9 @@ type_traverse(PyTypeObject *type, visitproc visit, void *arg)
47304730
for heaptypes. */
47314731
if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
47324732
char msg[200];
4733-
snprintf(msg, sizeof(msg),
4734-
"type_traverse() called on non-heap type '%.100s'",
4735-
type->tp_name);
4733+
PyOS_snprintf(msg, sizeof(msg),
4734+
"type_traverse() called on non-heap type '%.100s'",
4735+
type->tp_name);
47364736
_PyObject_ASSERT_FAILED_MSG((PyObject *)type, msg);
47374737
}
47384738

‎Python/specialize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ _Py_PrintSpecializationStats(int to_file)
232232
hex_name[40] = '\0';
233233
char buf[64];
234234
assert(strlen(dirname) + 40 + strlen(".txt") < 64);
235-
snprintf(buf, sizeof(buf), "%s%s.txt", dirname, hex_name);
235+
PyOS_snprintf(buf, sizeof(buf), "%s%s.txt", dirname, hex_name);
236236
FILE *fout = fopen(buf, "w");
237237
if (fout) {
238238
out = fout;

0 commit comments

Comments
 (0)