| Message ID | 20241112004540.9589-1-duncan_roe@optusnet.com.au |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [libmnl,v2] whitespace: remove spacing irregularities | expand |
Hi, On Tue, Nov 12, 2024 at 11:45:40AM +1100, Duncan Roe wrote: > Two distinct actions: > 1. Remove trailing spaces and tabs. > 2. Remove spaces that are followed by a tab, inserting extra tabs > as required. > Action 2 is only performed in the indent region of a line. > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> > --- > v2: Only fix spacing in .c files > src/callback.c | 4 ++-- > src/socket.c | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/src/callback.c b/src/callback.c > index f5349c3..703ae80 100644 > --- a/src/callback.c > +++ b/src/callback.c > @@ -21,7 +21,7 @@ static int mnl_cb_error(const struct nlmsghdr *nlh, void *data) > const struct nlmsgerr *err = mnl_nlmsg_get_payload(nlh); > > if (nlh->nlmsg_len < mnl_nlmsg_size(sizeof(struct nlmsgerr))) { > - errno = EBADMSG; > + errno = EBADMSG; > return MNL_CB_ERROR; > } > /* Netlink subsystems returns the errno value with different signess */ > @@ -73,7 +73,7 @@ static inline int __mnl_cb_run(const void *buf, size_t numbytes, > } > > /* netlink data message handling */ > - if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { > + if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { > if (cb_data){ > ret = cb_data(nlh, data); > if (ret <= MNL_CB_STOP) > diff --git a/src/socket.c b/src/socket.c > index 85b6bcc..60ba2cd 100644 > --- a/src/socket.c > +++ b/src/socket.c > @@ -206,7 +206,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, > > addr_len = sizeof(nl->addr); > ret = getsockname(nl->fd, (struct sockaddr *) &nl->addr, &addr_len); > - if (ret < 0) > + if (ret < 0) > return ret; > > if (addr_len != sizeof(nl->addr)) { > @@ -226,7 +226,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, > * \param buf buffer containing the netlink message to be sent > * \param len number of bytes in the buffer that you want to send > * > - * On error, it returns -1 and errno is appropriately set. Otherwise, it > + * On error, it returns -1 and errno is appropriately set. Otherwise, it > * returns the number of bytes sent. > */ > EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, > @@ -235,7 +235,7 @@ EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, > static const struct sockaddr_nl snl = { > .nl_family = AF_NETLINK > }; > - return sendto(nl->fd, buf, len, 0, > + return sendto(nl->fd, buf, len, 0, > (struct sockaddr *) &snl, sizeof(snl)); > } > > -- > 2.46.2 > > Can somebody please apply this? I removed the UAPI header patch as Pablo requested. Cheers ... Duncan.
On Thu, Nov 28, 2024 at 01:34:06PM +1100, Duncan Roe wrote: > Hi, > > On Tue, Nov 12, 2024 at 11:45:40AM +1100, Duncan Roe wrote: > > Two distinct actions: > > 1. Remove trailing spaces and tabs. > > 2. Remove spaces that are followed by a tab, inserting extra tabs > > as required. > > Action 2 is only performed in the indent region of a line. > > > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> > > --- > > v2: Only fix spacing in .c files > > src/callback.c | 4 ++-- > > src/socket.c | 6 +++--- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/src/callback.c b/src/callback.c > > index f5349c3..703ae80 100644 > > --- a/src/callback.c > > +++ b/src/callback.c > > @@ -21,7 +21,7 @@ static int mnl_cb_error(const struct nlmsghdr *nlh, void *data) > > const struct nlmsgerr *err = mnl_nlmsg_get_payload(nlh); > > > > if (nlh->nlmsg_len < mnl_nlmsg_size(sizeof(struct nlmsgerr))) { > > - errno = EBADMSG; > > + errno = EBADMSG; > > return MNL_CB_ERROR; > > } > > /* Netlink subsystems returns the errno value with different signess */ > > @@ -73,7 +73,7 @@ static inline int __mnl_cb_run(const void *buf, size_t numbytes, > > } > > > > /* netlink data message handling */ > > - if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { > > + if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { > > if (cb_data){ > > ret = cb_data(nlh, data); > > if (ret <= MNL_CB_STOP) > > diff --git a/src/socket.c b/src/socket.c > > index 85b6bcc..60ba2cd 100644 > > --- a/src/socket.c > > +++ b/src/socket.c > > @@ -206,7 +206,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, > > > > addr_len = sizeof(nl->addr); > > ret = getsockname(nl->fd, (struct sockaddr *) &nl->addr, &addr_len); > > - if (ret < 0) > > + if (ret < 0) > > return ret; > > > > if (addr_len != sizeof(nl->addr)) { > > @@ -226,7 +226,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, > > * \param buf buffer containing the netlink message to be sent > > * \param len number of bytes in the buffer that you want to send > > * > > - * On error, it returns -1 and errno is appropriately set. Otherwise, it > > + * On error, it returns -1 and errno is appropriately set. Otherwise, it > > * returns the number of bytes sent. > > */ > > EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, > > @@ -235,7 +235,7 @@ EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, > > static const struct sockaddr_nl snl = { > > .nl_family = AF_NETLINK > > }; > > - return sendto(nl->fd, buf, len, 0, > > + return sendto(nl->fd, buf, len, 0, > > (struct sockaddr *) &snl, sizeof(snl)); > > } > > > > -- > > 2.46.2 > > > > > Can somebody please apply this? I removed the UAPI header patch as Pablo > requested. > > Cheers ... Duncan.
Hi Pablo, On Thu, Nov 28, 2024 at 01:27:00PM +0100, Pablo Neira Ayuso wrote: > On Thu, Nov 28, 2024 at 01:34:06PM +1100, Duncan Roe wrote: > > Hi, > > > > On Tue, Nov 12, 2024 at 11:45:40AM +1100, Duncan Roe wrote: > > > Two distinct actions: > > > 1. Remove trailing spaces and tabs. > > > 2. Remove spaces that are followed by a tab, inserting extra tabs > > > as required. > > > Action 2 is only performed in the indent region of a line. > > > > > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> > > > --- > > > v2: Only fix spacing in .c files > > > src/callback.c | 4 ++-- > > > src/socket.c | 6 +++--- > > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > > > > diff --git a/src/callback.c b/src/callback.c > > > index f5349c3..703ae80 100644 > > > --- a/src/callback.c > > > +++ b/src/callback.c > > > @@ -21,7 +21,7 @@ static int mnl_cb_error(const struct nlmsghdr *nlh, void *data) > > > const struct nlmsgerr *err = mnl_nlmsg_get_payload(nlh); > > > > > > if (nlh->nlmsg_len < mnl_nlmsg_size(sizeof(struct nlmsgerr))) { > > > - errno = EBADMSG; > > > + errno = EBADMSG; > > > return MNL_CB_ERROR; > > > } > > > /* Netlink subsystems returns the errno value with different signess */ > > > @@ -73,7 +73,7 @@ static inline int __mnl_cb_run(const void *buf, size_t numbytes, > > > } > > > > > > /* netlink data message handling */ > > > - if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { > > > + if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { > > > if (cb_data){ > > > ret = cb_data(nlh, data); > > > if (ret <= MNL_CB_STOP) > > > diff --git a/src/socket.c b/src/socket.c > > > index 85b6bcc..60ba2cd 100644 > > > --- a/src/socket.c > > > +++ b/src/socket.c > > > @@ -206,7 +206,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, > > > > > > addr_len = sizeof(nl->addr); > > > ret = getsockname(nl->fd, (struct sockaddr *) &nl->addr, &addr_len); > > > - if (ret < 0) > > > + if (ret < 0) > > > return ret; > > > > > > if (addr_len != sizeof(nl->addr)) { > > > @@ -226,7 +226,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, > > > * \param buf buffer containing the netlink message to be sent > > > * \param len number of bytes in the buffer that you want to send > > > * > > > - * On error, it returns -1 and errno is appropriately set. Otherwise, it > > > + * On error, it returns -1 and errno is appropriately set. Otherwise, it > > > * returns the number of bytes sent. > > > */ > > > EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, > > > @@ -235,7 +235,7 @@ EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, > > > static const struct sockaddr_nl snl = { > > > .nl_family = AF_NETLINK > > > }; > > > - return sendto(nl->fd, buf, len, 0, > > > + return sendto(nl->fd, buf, len, 0, > > > (struct sockaddr *) &snl, sizeof(snl)); > > > } > > > > > > -- > > > 2.46.2 > > > > > > > > Can somebody please apply this? I removed the UAPI header patch as Pablo > > requested. > > > > Cheers ... Duncan. Did you mean to add something? I see it's still not applied. Cheers ... Duncan.
diff --git a/src/callback.c b/src/callback.c index f5349c3..703ae80 100644 --- a/src/callback.c +++ b/src/callback.c @@ -21,7 +21,7 @@ static int mnl_cb_error(const struct nlmsghdr *nlh, void *data) const struct nlmsgerr *err = mnl_nlmsg_get_payload(nlh); if (nlh->nlmsg_len < mnl_nlmsg_size(sizeof(struct nlmsgerr))) { - errno = EBADMSG; + errno = EBADMSG; return MNL_CB_ERROR; } /* Netlink subsystems returns the errno value with different signess */ @@ -73,7 +73,7 @@ static inline int __mnl_cb_run(const void *buf, size_t numbytes, } /* netlink data message handling */ - if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { + if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { if (cb_data){ ret = cb_data(nlh, data); if (ret <= MNL_CB_STOP) diff --git a/src/socket.c b/src/socket.c index 85b6bcc..60ba2cd 100644 --- a/src/socket.c +++ b/src/socket.c @@ -206,7 +206,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, addr_len = sizeof(nl->addr); ret = getsockname(nl->fd, (struct sockaddr *) &nl->addr, &addr_len); - if (ret < 0) + if (ret < 0) return ret; if (addr_len != sizeof(nl->addr)) { @@ -226,7 +226,7 @@ EXPORT_SYMBOL int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, * \param buf buffer containing the netlink message to be sent * \param len number of bytes in the buffer that you want to send * - * On error, it returns -1 and errno is appropriately set. Otherwise, it + * On error, it returns -1 and errno is appropriately set. Otherwise, it * returns the number of bytes sent. */ EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, @@ -235,7 +235,7 @@ EXPORT_SYMBOL ssize_t mnl_socket_sendto(const struct mnl_socket *nl, static const struct sockaddr_nl snl = { .nl_family = AF_NETLINK }; - return sendto(nl->fd, buf, len, 0, + return sendto(nl->fd, buf, len, 0, (struct sockaddr *) &snl, sizeof(snl)); }
Two distinct actions: 1. Remove trailing spaces and tabs. 2. Remove spaces that are followed by a tab, inserting extra tabs as required. Action 2 is only performed in the indent region of a line. Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> --- v2: Only fix spacing in .c files src/callback.c | 4 ++-- src/socket.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)