Re: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[Jozsef Kadlecsik <kadlec@netfilter.org>]

[-- Attachment #1: Type: text/plain, Size: 2654 bytes --]

On Tue, 7 Jan 2025, Szőke Benjamin wrote:

> 2025. 01. 07. 20:23 keltezéssel, Jozsef Kadlecsik írta:
> > On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
> > 
> > > From: Benjamin Szőke <egyszeregy@freemail.hu>
> > > 
> > > Merge xt_DSCP.h to xt_dscp.h header file.
> > 
> > I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h 
> > header file." (and in the other patches as well).
> 
> There will be no any new patchset refactoring anymore just of some 
> cosmetics change. If you like to change it, feel free to modify it in my 
> pacthfiles before the final merging. You can do it as a maintainer.

We don't modify accepted patches. It rarely happens when time presses and 
even in that case it is discussed publicly: "sorry, no time to wait for 
*you* to respin your patch, so I'm going to fix this part, OK?"

But there's no time constrain here. So it'd be strange at the minimum if 
your submitted patches were modified by a maintainer at merging.

Believe it or not, I'm just trying to help to get your patches into the 
best shape.
 
> > > -#ifndef _XT_DSCP_H
> > > -#define _XT_DSCP_H
> > > +#ifndef _UAPI_XT_DSCP_H
> > > +#define _UAPI_XT_DSCP_H
> > 
> > In the first four patches you added the _UAPI_ prefix to the header 
> > guards while in the next three ones you kept the original ones. Please 
> > use one style consistently.
>
> Style consistently is done in the following files:
> 
> - All of xt_*.h files in uppercase name format (old headers for "target")
> - All of xt_*.h files in lowercase name format (merged header files)
> 
> Originally, in these files there was a chaotic state before, it was a 
> painful for my eyes, this is why they got these changes. In ipt_*.h 
> files the original codes got a far enough consistently style before, 
> they was not changed.
> 
> In my patchsets, It's not my scope/job to make up for the
> improvements/refactoring of the last 10 years.

But you are just introducing new inconsistencies: 

--- a/include/uapi/linux/netfilter/xt_dscp.h
+++ b/include/uapi/linux/netfilter/xt_dscp.h
...
-#ifndef _XT_DSCP_H
-#define _XT_DSCP_H
+#ifndef _UAPI_XT_DSCP_H
+#define _UAPI_XT_DSCP_H

however

--- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
...
 #ifndef _IPT_ECN_H
 #define _IPT_ECN_H

Why the "_UAPI_" prefixes are needed in the xt_*.h header files?

Best regards,
Jozsef
-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary