Use nitems() #888

ElyesH · 2023-11-04T09:48:41Z

No description provided.

emaste · 2023-11-05T16:32:15Z

Where is the ARRAY_SIZE definition coming from? See also nitems() in sys/param.h

igalic · 2023-11-07T20:37:25Z

@ElyesH would you mind amending your commit messages with

Pull Request: https://github.com/freebsd/freebsd-src/pull/888

?

ElyesH · 2023-11-08T17:52:21Z

@ElyesH would you mind amending your commit messages with
Pull Request: https://github.com/freebsd/freebsd-src/pull/888
?

Hi,
Sorry for the question, But please , what you mean by pull request ? I'm using git and git pull https://github.com/freebsd/freebsd-src/pull/888 won't work here

igalic · 2023-11-09T17:40:16Z

When you look at the actual commits that landed from your last Pull Request:

e5f905c

for instance, you don't see a reference to the Pull Request.
That's why I'm asking if you could include a reference to this Pull Request in all its commit messages.

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

bsdimp · 2024-04-11T18:09:19Z

usr.sbin/rtadvd/control_server.c

@@ -27,6 +27,7 @@
 *
 */

+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>


types.h can be removed

bsdimp · 2024-04-11T18:09:37Z

usr.sbin/usbconfig/usbconfig.c

@@ -36,6 +36,7 @@
 #include <grp.h>
 #include <errno.h>
 #include <ctype.h>
+#include <sys/param.h>
 #include <sys/types.h>


types.h can be removed

bsdimp · 2024-04-11T18:09:52Z

usr.sbin/zonectl/zonectl.c

@@ -32,6 +32,7 @@

 #include <sys/cdefs.h>
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <sys/stdint.h>
 #include <sys/types.h>


types.h can be removed.

bsdimp · 2024-04-11T18:09:59Z

usr.sbin/wlandebug/wlandebug.c

@@ -33,6 +33,7 @@
 * wlandebug [-i interface] flags
 * (default interface is wlan.0).
 */
+#include <sys/param.h>
 #include <sys/types.h>


types.h can be removed

bsdimp · 2024-04-11T18:11:44Z

This needs a rebase, and it needs to remove the sys/types.h and sys/cdefs.h when we add sys/param.h.
It's on the edge of 'useful enough' but if you do that, and remove the 'Pull Request: ' lines from the commit messages, then I'll go ahead and commit it. as far as I can tell, there's no semantic change.

markpeek · 2024-04-11T21:20:19Z

sbin/setkey/setkey.c

@@ -502,7 +502,7 @@ static const char *ipproto[] = {
 };

 #define STR_OR_ID(x, tab) \
-	(((x) < sizeof(tab)/sizeof(tab[0]) && tab[(x)])	? tab[(x)] : numstr(x))
+	(((x) < nitems(tab) && tab[(x)])	? tab[(x)] : numstr(x))


This looks to have an preexisting tab character before the "?" that should be a space.

markpeek · 2024-04-11T21:25:45Z

usr.sbin/moused/moused.c

@@ -1566,7 +1566,7 @@ r_name(int type)
    const char *unknown = "unknown";

    return (type == MOUSE_PROTO_UNKNOWN ||
-	type >= (int)(sizeof(rnames) / sizeof(rnames[0])) ?
+	type >= (int)nitems(rnames) ?


@bsdimp should this be flattened into 2 lines instead of 3? Namely:

return (type == MOUSE_PROTO_UNKNOWN || type >= (int)nitems(rnames) ? unknown : rnames[type]);

Yes, I think so...

bsdimp · 2024-04-23T18:05:49Z

I may try to land the ones w/o comments and that don't conflict to reduce the rebase effort / hassle.

bsdimp · 2024-04-29T04:27:54Z

OK. I've landed what I can. I'm closing this. Under the policy when it was submitted, it was OK, but the new policy is to only accept changes that can enumerate a specific problem, so I'm going to close it, but it's unlikely we'd accept the update. I did make the changes I wanted and that markj highlighted since this has taken so long, but generally I don't like to tweak the pull requests...

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

ElyesH changed the title ~~Use ARRAY_SIZE()~~ WIP Nov 7, 2023

ElyesH force-pushed the ARRAY_SIZE branch from 0a548ad to 6c20cac Compare November 7, 2023 17:15

ElyesH requested a review from bsdjhb as a code owner November 7, 2023 17:15

ElyesH changed the title ~~WIP~~ Use nitems() Nov 7, 2023

ElyesH added 22 commits November 9, 2023 18:54

bluetooth: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

5499151

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

rtadvd: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

ff62bd1

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

rtadvctl: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

17f752b

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

bhyve: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

effe97d

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

btxld: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

d322988

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

ctladm: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

cc5bdd9

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

ctld: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

b5e4ec5

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

kbdcontrol: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

692adc9

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

lpr: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

1b4bf95

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

moused: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

4323400

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

ndp: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

9f0901a

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

ppp: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

47eceb7

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

pstat: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

edab8a8

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

rwhod: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

a6f9287

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

traceroute6: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

4cb2c0a

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

usbconfig: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

296f575

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

wlandebug: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

fa2dc1c

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

zonectl: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

db2b249

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

ipfw: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

0ede788

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

camcontrol: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

4365b08

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

hastd: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

09e8c0a

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

ipf: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

a42d326

Pull Request: freebsd#888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

bsdimp reviewed Apr 11, 2024

View reviewed changes

bsdimp added the changes-required label Apr 11, 2024

markpeek reviewed Apr 11, 2024

View reviewed changes

bsdimp closed this Apr 29, 2024

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

bluetooth: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

fdbf7ca

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

rtadvd: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

93e96d6

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

rtadvctl: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

d1d652c

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

btxld: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

8918cc9

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

ctladm: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

2f8ea2f

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

ctld: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

8f65dcd

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

kbdcontrol: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

338d9c3

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

moused: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

83409a9

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

ndp: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

bccbb2f

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

ppp: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

67db7b4

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

pstat: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

f93475c

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

rwhod: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

4c6e656

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

usbconfig: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

abab59f

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

wlandebug: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

cbfd42c

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

zonectl: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

b561d8f

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

ipfw: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

c3c8161

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

camcontrol: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

7028e63

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

ipf: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

70fad8a

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

freebsd-git pushed a commit that referenced this pull request Apr 29, 2024

setkey: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

d94c991

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use nitems() #888

Use nitems() #888

ElyesH commented Nov 4, 2023

emaste commented Nov 5, 2023

igalic commented Nov 7, 2023

ElyesH commented Nov 8, 2023

igalic commented Nov 9, 2023

bsdimp Apr 11, 2024

bsdimp Apr 11, 2024

bsdimp Apr 11, 2024

bsdimp Apr 11, 2024

bsdimp commented Apr 11, 2024

markpeek Apr 11, 2024

markpeek Apr 11, 2024

bsdimp Apr 17, 2024

bsdimp commented Apr 23, 2024

bsdimp commented Apr 29, 2024

Use nitems() #888

Use nitems() #888

Conversation

ElyesH commented Nov 4, 2023

emaste commented Nov 5, 2023

igalic commented Nov 7, 2023

ElyesH commented Nov 8, 2023

igalic commented Nov 9, 2023

bsdimp Apr 11, 2024

Choose a reason for hiding this comment

bsdimp Apr 11, 2024

Choose a reason for hiding this comment

bsdimp Apr 11, 2024

Choose a reason for hiding this comment

bsdimp Apr 11, 2024

Choose a reason for hiding this comment

bsdimp commented Apr 11, 2024

markpeek Apr 11, 2024

Choose a reason for hiding this comment

markpeek Apr 11, 2024

Choose a reason for hiding this comment

bsdimp Apr 17, 2024

Choose a reason for hiding this comment

bsdimp commented Apr 23, 2024

bsdimp commented Apr 29, 2024