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