Page MenuHomeFreeBSD
Differential D30253

libalias: replace placeholder with static constant
ClosedPublic
Actions

Authored by donner on May 13 2021, 9:50 PM.
Tags
None
Referenced Files
F114205153: D30253.id89255.diff
Wed, Apr 9, 3:36 AM
Unknown Object (File)
Sun, Mar 16, 8:44 PM
Unknown Object (File)
Sun, Mar 16, 8:22 PM
Unknown Object (File)
Feb 24 2025, 7:10 AM
Unknown Object (File)
Jan 8 2025, 12:10 PM
Unknown Object (File)
Jan 8 2025, 12:08 PM
Unknown Object (File)
Jan 8 2025, 11:59 AM
Unknown Object (File)
Jan 8 2025, 11:11 AM
View All 100 Files
Subscribers
imp
melifaro
Contributor Reviews (src)

Details

Reviewers
• hselasky
emaste
eugen_grosbein.net
Group Reviewers
network
Commits
rG6a1b3e91539d: libalias: replace placeholder with static constant
rG16adf789ba68: libalias: replace placeholder with static constant
rG189f8eea138a: libalias: replace placeholder with static constant
Summary

The field nullAddress in struct libalias is never set and never used.
It exists as a placeholder for an unused argument only.

Test Plan

Just recompile everything.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 39188
Build 36077: arc lint + arc unit

Event Timeline

donner created this revision.May 13 2021, 9:50 PM
Herald added subscribers: Contributor Reviews (src), melifaro, imp. · View Herald TranscriptMay 13 2021, 9:50 PM
donner requested review of this revision.May 13 2021, 9:50 PM
Harbormaster completed remote builds in B39174: Diff 89166.May 13 2021, 9:50 PM
donner added reviewers: network, • hselasky, emaste, eugen_grosbein.net.May 13 2021, 9:55 PM
• hselasky added inline comments.May 14 2021, 8:45 AM
sys/netinet/libalias/alias_db.c
227

Should it be:
static const struct in_addr ???

donner updated this revision to Diff 89186.May 14 2021, 9:14 AM
  • Silence warning about non-static declaration.
Harbormaster completed remote builds in B39185: Diff 89186.May 14 2021, 9:15 AM
donner marked an inline comment as done.May 14 2021, 9:16 AM
donner added inline comments.
sys/netinet/libalias/alias_db.c
227

The compiler had the same question. Thank you for spotting this.

• hselasky added inline comments.May 14 2021, 10:26 AM
sys/netinet/libalias/alias_db.c
229

Should you also add "const" keyword here?

donner updated this revision to Diff 89210.May 14 2021, 1:21 PM
donner marked an inline comment as done.
  • Make it const.
Harbormaster completed remote builds in B39188: Diff 89210.May 14 2021, 1:22 PM
donner marked an inline comment as done.May 14 2021, 1:23 PM

Rebased to D30259

sys/netinet/libalias/alias_db.c
229

You are right. Added const.

donner added a parent revision: D30259: libalias: Style cleanup.May 14 2021, 1:23 PM
• hselasky accepted this revision.May 14 2021, 2:16 PM

Looks good.

This revision is now accepted and ready to land.May 14 2021, 2:16 PM
Closed by commit rG189f8eea138a: libalias: replace placeholder with static constant (authored by donner). · Explain WhyMay 15 2021, 7:09 AM
This revision was automatically updated to reflect the committed changes.
donner marked an inline comment as done.
donner added a commit: rG189f8eea138a: libalias: replace placeholder with static constant.
donner added a commit: rG16adf789ba68: libalias: replace placeholder with static constant.May 30 2021, 1:50 PM
donner added a commit: rG6a1b3e91539d: libalias: replace placeholder with static constant.May 30 2021, 8:04 PM

Revision Contents
Changeset List

PathSize
sys/
netinet/
libalias/
24 lines
2 lines

Diff 89210

View Options

sys/netinet/libalias/alias_db.c

Context not available.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 8, 2010 .Dd February 11, 2016
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
Context not available.
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp
This example shows the use of
.Xr dma 8
in place of
wblockUnsubmitted
Not Done
Inline Actions

This is probably better like the comment, "instead of". I suspect that is more common and easier for translators.
...Ah, I see that the other examples use "in place of". Well, no time like the present to break with tradition.

wblock: This is probably better like the comment, "instead of". I suspect that is more common and…
wblockUnsubmitted
Not Done
Inline Actions

"in favor of" usually means the second thing is better than/preferred to/replacing the first. It is kind of confusing here.

Sometimes difficulty in simplifying a sentence means that it is trying to say to much or working too hard to get there.
What about changing this to be more direct than the original man page wording, like so:

This example shows how to use
.Xr dma 8
as a replacement for
.Xr sendmail 8 :

That could be even simpler:

Using
.Xr dma 8
to replace
.Xr sendmail 8 :
wblock: "in favor of" usually means the second thing is better than/preferred to/replacing the first.
.Xr sendmail 8 :
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
.Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr mailq 1 , .Xr mailq 1 ,
Context not available.
View Options

sys/netinet/libalias/alias_local.h

Context not available.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 8, 2010 .Dd February 11, 2016
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
Context not available.
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp
This example shows the use of
.Xr dma 8
in place of
wblockUnsubmitted
Not Done
Inline Actions

This is probably better like the comment, "instead of". I suspect that is more common and easier for translators.
...Ah, I see that the other examples use "in place of". Well, no time like the present to break with tradition.

wblock: This is probably better like the comment, "instead of". I suspect that is more common and…
wblockUnsubmitted
Not Done
Inline Actions

"in favor of" usually means the second thing is better than/preferred to/replacing the first. It is kind of confusing here.

Sometimes difficulty in simplifying a sentence means that it is trying to say to much or working too hard to get there.
What about changing this to be more direct than the original man page wording, like so:

This example shows how to use
.Xr dma 8
as a replacement for
.Xr sendmail 8 :

That could be even simpler:

Using
.Xr dma 8
to replace
.Xr sendmail 8 :
wblock: "in favor of" usually means the second thing is better than/preferred to/replacing the first.
.Xr sendmail 8 :
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
.Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr mailq 1 , .Xr mailq 1 ,
Context not available.