Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
bf1039d9
Commit
bf1039d9
authored
Oct 27, 2009
by
Mark Dickinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silence gcc warnings when trying to print an off_t using "lld", on platforms
where off_t has type long (e.g., 64-bit Linux).
parent
8aea0509
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
Modules/_io/_iomodule.h
Modules/_io/_iomodule.h
+12
-1
Modules/_io/bufferedio.c
Modules/_io/bufferedio.c
+2
-2
No files found.
Modules/_io/_iomodule.h
View file @
bf1039d9
...
...
@@ -75,6 +75,14 @@ PyAPI_DATA(PyObject *) PyExc_BlockingIOError;
* Offset type for positioning.
*/
/* Printing a variable of type off_t correctly and without producing
compiler warnings is surprisingly painful. We identify an integer
type whose size matches off_t and then: (1) cast the off_t to that
integer type and (2) use the appropriate conversion specification
for printf. The cast is necessary: gcc complains about formatting
a long with "%lld" even when both long and long long have the same
precision. */
#if defined(MS_WIN64) || defined(MS_WINDOWS)
/* Windows uses long long for offsets */
...
...
@@ -84,7 +92,7 @@ typedef PY_LONG_LONG Py_off_t;
# define PY_OFF_T_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_PRIdOFF "lld"
/* format to use in printf with type off_t */
# define PY_OFF_T_COMPAT long long
/* standard type compatible with off_t */
#else
/* Other platforms use off_t */
...
...
@@ -95,18 +103,21 @@ typedef off_t Py_off_t;
# define PY_OFF_T_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_PRIdOFF "lld"
# define PY_OFF_T_COMPAT long long
#elif (SIZEOF_OFF_T == SIZEOF_LONG)
# define PyLong_AsOff_t PyLong_AsLong
# define PyLong_FromOff_t PyLong_FromLong
# define PY_OFF_T_MAX LONG_MAX
# define PY_OFF_T_MIN LONG_MIN
# define PY_PRIdOFF "ld"
# define PY_OFF_T_COMPAT long
#elif (SIZEOF_OFF_T == SIZEOF_SIZE_T)
# define PyLong_AsOff_t PyLong_AsSsize_t
# define PyLong_FromOff_t PyLong_FromSsize_t
# define PY_OFF_T_MAX PY_SSIZE_T_MAX
# define PY_OFF_T_MIN PY_SSIZE_T_MIN
# define PY_PRIdOFF "zd"
# define PY_OFF_T_COMPAT Py_ssize_t
#else
# error off_t does not match either size_t, long, or long long!
#endif
...
...
Modules/_io/bufferedio.c
View file @
bf1039d9
...
...
@@ -581,7 +581,7 @@ _buffered_raw_tell(buffered *self)
if
(
!
PyErr_Occurred
())
PyErr_Format
(
PyExc_IOError
,
"Raw stream returned invalid position %"
PY_PRIdOFF
,
n
);
(
PY_OFF_T_COMPAT
)
n
);
return
-
1
;
}
self
->
abs_pos
=
n
;
...
...
@@ -614,7 +614,7 @@ _buffered_raw_seek(buffered *self, Py_off_t target, int whence)
if
(
!
PyErr_Occurred
())
PyErr_Format
(
PyExc_IOError
,
"Raw stream returned invalid position %"
PY_PRIdOFF
,
n
);
(
PY_OFF_T_COMPAT
)
n
);
return
-
1
;
}
self
->
abs_pos
=
n
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment