File tree Expand file tree Collapse file tree 10 files changed +18
-18
lines changed
Expand file tree Collapse file tree 10 files changed +18
-18
lines changed Original file line number Diff line number Diff line change 1313#include <stddef.h>
1414
1515
16- extern inline void * mallocarray (size_t nmemb , size_t size );
16+ extern inline void * mallocarray (size_t n , size_t size );
Original file line number Diff line number Diff line change 2121
2222ATTR_ALLOC_SIZE (1 , 2 )
2323ATTR_MALLOC (free )
24- inline void * mallocarray (size_t nmemb , size_t size );
24+ inline void * mallocarray (size_t n , size_t size );
2525
2626
2727inline void *
28- mallocarray (size_t nmemb , size_t size )
28+ mallocarray (size_t n , size_t size )
2929{
30- return reallocarray (NULL , nmemb , size );
30+ return reallocarray (NULL , n , size );
3131}
3232
3333
Original file line number Diff line number Diff line change 1313#include <stddef.h>
1414
1515
16- extern inline void * reallocarrayf (void * p , size_t nmemb , size_t size );
16+ extern inline void * reallocarrayf (void * p , size_t n , size_t size );
Original file line number Diff line number Diff line change 2222
2323ATTR_ALLOC_SIZE (2 , 3 )
2424ATTR_MALLOC (free )
25- inline void * reallocarrayf (void * p , size_t nmemb , size_t size );
25+ inline void * reallocarrayf (void * p , size_t n , size_t size );
2626
2727
2828inline void *
29- reallocarrayf (void * p , size_t nmemb , size_t size )
29+ reallocarrayf (void * p , size_t n , size_t size )
3030{
3131 void * q ;
3232
33- q = reallocarray (p , nmemb ?: 1 , size ?: 1 );
33+ q = reallocarray (p , n ?: 1 , size ?: 1 );
3434
3535 if (q == NULL )
3636 free (p );
Original file line number Diff line number Diff line change 1919
2020
2121void *
22- xcalloc (size_t nmemb , size_t size )
22+ xcalloc (size_t n , size_t size )
2323{
2424 void * p ;
2525
26- p = calloc (nmemb , size );
26+ p = calloc (n , size );
2727 if (p == NULL )
2828 goto x ;
2929
Original file line number Diff line number Diff line change 2222
2323ATTR_ALLOC_SIZE (1 , 2 )
2424ATTR_MALLOC (free )
25- void * xcalloc (size_t nmemb , size_t size );
25+ void * xcalloc (size_t n , size_t size );
2626
2727
2828#endif // include guard
Original file line number Diff line number Diff line change 1313#include <stddef.h>
1414
1515
16- extern inline void * xmallocarray (size_t nmemb , size_t size );
16+ extern inline void * xmallocarray (size_t n , size_t size );
Original file line number Diff line number Diff line change 2222
2323ATTR_ALLOC_SIZE (1 , 2 )
2424ATTR_MALLOC (free )
25- inline void * xmallocarray (size_t nmemb , size_t size );
25+ inline void * xmallocarray (size_t n , size_t size );
2626
2727
2828inline void *
29- xmallocarray (size_t nmemb , size_t size )
29+ xmallocarray (size_t n , size_t size )
3030{
31- return xreallocarray (NULL , nmemb , size );
31+ return xreallocarray (NULL , n , size );
3232}
3333
3434
Original file line number Diff line number Diff line change 2020
2121
2222void *
23- xreallocarray (void * p , size_t nmemb , size_t size )
23+ xreallocarray (void * p , size_t n , size_t size )
2424{
25- p = reallocarrayf (p , nmemb , size );
25+ p = reallocarrayf (p , n , size );
2626 if (p == NULL )
2727 goto x ;
2828
Original file line number Diff line number Diff line change 2525
2626ATTR_ALLOC_SIZE (2 , 3 )
2727ATTR_MALLOC (free )
28- void * xreallocarray (void * p , size_t nmemb , size_t size );
28+ void * xreallocarray (void * p , size_t n , size_t size );
2929
3030
3131#endif // include guard
You can’t perform that action at this time.
0 commit comments