Skip to content

Commit b20779a

Browse files
lib/alloc/: Compact parameter names
'n' is just as meaningful as 'nmemb', and is in more common use in C projects (including this one). Signed-off-by: Alejandro Colomar <alx@kernel.org>
1 parent bb4a2da commit b20779a

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

lib/alloc/malloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
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);

lib/alloc/malloc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
ATTR_ALLOC_SIZE(1, 2)
2323
ATTR_MALLOC(free)
24-
inline void *mallocarray(size_t nmemb, size_t size);
24+
inline void *mallocarray(size_t n, size_t size);
2525

2626

2727
inline 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

lib/alloc/reallocf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
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);

lib/alloc/reallocf.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222

2323
ATTR_ALLOC_SIZE(2, 3)
2424
ATTR_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

2828
inline 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);

lib/alloc/x/xcalloc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020

2121
void *
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

lib/alloc/x/xcalloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
ATTR_ALLOC_SIZE(1, 2)
2424
ATTR_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

lib/alloc/x/xmalloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
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);

lib/alloc/x/xmalloc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
ATTR_ALLOC_SIZE(1, 2)
2424
ATTR_MALLOC(free)
25-
inline void *xmallocarray(size_t nmemb, size_t size);
25+
inline void *xmallocarray(size_t n, size_t size);
2626

2727

2828
inline 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

lib/alloc/x/xrealloc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121

2222
void *
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

lib/alloc/x/xrealloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
ATTR_ALLOC_SIZE(2, 3)
2727
ATTR_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

0 commit comments

Comments
 (0)