|
|
147e83 |
Fix potential ABI change introduced by glibc-rh1398413.patch.
|
|
|
147e83 |
|
|
|
147e83 |
extern void _IO_str_init_static (struct _IO_strfile_ *, char *, int, char *)
|
|
|
147e83 |
__THROW;
|
|
|
147e83 |
extern void _IO_str_init_readonly (struct _IO_strfile_ *, const char *, int)
|
|
|
147e83 |
__THROW;
|
|
|
147e83 |
|
|
|
147e83 |
Upstream, this did not have any effect because the function definitions
|
|
|
147e83 |
were prototypes, so there is no upstream fix necessary.
|
|
|
147e83 |
|
|
|
147e83 |
But downstream, we have:
|
|
|
147e83 |
|
|
|
147e83 |
70 void
|
|
|
147e83 |
71 _IO_str_init_static (sf, ptr, size, pstart)
|
|
|
147e83 |
72 _IO_strfile *sf;
|
|
|
147e83 |
73 char *ptr;
|
|
|
147e83 |
74 int size;
|
|
|
147e83 |
75 char *pstart;
|
|
|
147e83 |
76 {
|
|
|
147e83 |
77 return _IO_str_init_static_internal (sf, ptr, size < 0 ? -1 : size, pstart);
|
|
|
147e83 |
78 }
|
|
|
147e83 |
79
|
|
|
147e83 |
80 void
|
|
|
147e83 |
81 _IO_str_init_readonly (sf, ptr, size)
|
|
|
147e83 |
82 _IO_strfile *sf;
|
|
|
147e83 |
83 const char *ptr;
|
|
|
147e83 |
84 int size;
|
|
|
147e83 |
85 {
|
|
|
147e83 |
86 _IO_str_init_static_internal (sf, (char *) ptr, size < 0 ? -1 : size, NULL);
|
|
|
147e83 |
87 sf->_sbf._f._IO_file_flags |= _IO_NO_WRITES;
|
|
|
147e83 |
88 }
|
|
|
147e83 |
|
|
|
147e83 |
This results in:
|
|
|
147e83 |
|
|
|
147e83 |
strops.c:71:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
|
|
|
147e83 |
strops.c:81:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
|
|
|
147e83 |
|
|
|
147e83 |
It is a potential ABI change, depending on the architecture. None of
|
|
|
147e83 |
the architectures in Red Hat Enterprise Linux appear to be affected,
|
|
|
147e83 |
though.
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/libio/strops.c b/libio/strops.c
|
|
|
147e83 |
index 7df842fa519e4a49..a5b76af963e77877 100644
|
|
|
147e83 |
--- a/libio/strops.c
|
|
|
147e83 |
+++ b/libio/strops.c
|
|
|
147e83 |
@@ -68,20 +68,13 @@ _IO_str_init_static_internal (sf, ptr, size, pstart)
|
|
|
147e83 |
}
|
|
|
147e83 |
|
|
|
147e83 |
void
|
|
|
147e83 |
-_IO_str_init_static (sf, ptr, size, pstart)
|
|
|
147e83 |
- _IO_strfile *sf;
|
|
|
147e83 |
- char *ptr;
|
|
|
147e83 |
- int size;
|
|
|
147e83 |
- char *pstart;
|
|
|
147e83 |
+_IO_str_init_static (_IO_strfile *sf, char *ptr, int size, char *pstart)
|
|
|
147e83 |
{
|
|
|
147e83 |
return _IO_str_init_static_internal (sf, ptr, size < 0 ? -1 : size, pstart);
|
|
|
147e83 |
}
|
|
|
147e83 |
|
|
|
147e83 |
void
|
|
|
147e83 |
-_IO_str_init_readonly (sf, ptr, size)
|
|
|
147e83 |
- _IO_strfile *sf;
|
|
|
147e83 |
- const char *ptr;
|
|
|
147e83 |
- int size;
|
|
|
147e83 |
+_IO_str_init_readonly (_IO_strfile *sf, const char *ptr, int size)
|
|
|
147e83 |
{
|
|
|
147e83 |
_IO_str_init_static_internal (sf, (char *) ptr, size < 0 ? -1 : size, NULL);
|
|
|
147e83 |
sf->_sbf._f._IO_file_flags |= _IO_NO_WRITES;
|