From: Sergei Shtylyov <sergei.shtylyov@cogentembedded•com>
To: Vadim Kochan <vadim4j@gmail•com>, netdev@vger•kernel.org
Cc: daniel@iogearbox•net
Subject: Re: [PATCH iproute2 2/2] tc class: Ignore if default class name file does not exist
Date: Tue, 17 Mar 2015 22:48:48 +0300 [thread overview]
Message-ID: <55088520.6030805@cogentembedded.com> (raw)
In-Reply-To: <1426611124-2295-3-git-send-email-vadim4j@gmail.com>
Hello.
On 03/17/2015 07:52 PM, Vadim Kochan wrote:
> From: Vadim Kochan <vadim4j@gmail•com>
> If '-nm' specified then do not fail if there is no
> default class names file in /etc/iproute2.
> Changed default class name file cls_names -> tc_cls.
> Signed-off-by: Vadim Kochan <vadim4j@gmail•com>
> ---
> tc/tc_util.c | 19 +++++++++++++++----
> 1 file changed, 15 insertions(+), 4 deletions(-)
> diff --git a/tc/tc_util.c b/tc/tc_util.c
> index feae439..5213e9e 100644
> --- a/tc/tc_util.c
> +++ b/tc/tc_util.c
[...]
> @@ -33,15 +34,25 @@
>
> static struct db_names *cls_names = NULL;
>
> -#define NAMES_DB "/etc/iproute2/cls_names"
> +#define NAMES_DB "/etc/iproute2/tc_cls"
>
> int cls_names_init(char *path)
> {
> - cls_names = db_names_alloc(path ?: NAMES_DB);
> - if (!cls_names) {
> - fprintf(stderr, "Error while opening class names file\n");
> + int ret = -1;
Pointless initializer.
> +
> + cls_names = db_names_alloc();
> + if (!cls_names)
> + return -1;
> +
> + ret = db_names_load(cls_names, path ?: NAMES_DB);
> + if (ret == -ENOENT && path) {
> + fprintf(stderr, "Can't open class names file: %s\n", path);
> return -1;
> }
> + if (ret) {
> + db_names_free(cls_names);
> + cls_names = NULL;
> + }
>
> return 0;
> }
WBR, Sergei
prev parent reply other threads:[~2015-03-17 19:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-17 16:52 [PATCH iproute2 0/2] tc class names: Ignore if default file does not exist Vadim Kochan
2015-03-17 16:52 ` [PATCH iproute2 1/2] lib names: Split to db_names_alloc and db_names_load Vadim Kochan
2015-03-17 16:52 ` [PATCH iproute2 2/2] tc class: Ignore if default class name file does not exist Vadim Kochan
2015-03-17 17:34 ` Daniel Borkmann
2015-03-17 18:21 ` Vadim Kochan
2015-03-17 18:37 ` Daniel Borkmann
2015-03-17 19:48 ` Sergei Shtylyov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55088520.6030805@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=vadim4j@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox