Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/net-tools:gentoo commit in: lib/
Date: Mon, 21 Nov 2011 01:39:25
Message-Id: 6a9347cb91535eb35306eff731d94384c9b7025e.vapier@gentoo
1 commit: 6a9347cb91535eb35306eff731d94384c9b7025e
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 21 00:08:15 2011 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 21 00:11:22 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git;a=commit;h=6a9347cb
7
8 get_sname: unify numeric handling
9
10 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
11
12 ---
13 lib/inet.c | 12 +++++++-----
14 1 files changed, 7 insertions(+), 5 deletions(-)
15
16 diff --git a/lib/inet.c b/lib/inet.c
17 index 8080364..073c8a3 100644
18 --- a/lib/inet.c
19 +++ b/lib/inet.c
20 @@ -423,10 +423,9 @@ const char *get_sname(int socknumber, const char *proto, int numeric)
21
22 if (socknumber == 0)
23 return ("*");
24 - if (numeric) {
25 - sprintf(buffer, "%d", ntohs(socknumber));
26 - return (buffer);
27 - }
28 + if (numeric)
29 + goto do_ntohs;
30 +
31 if (!init) {
32 (void) read_services();
33 init = 1;
34 @@ -443,8 +442,11 @@ const char *get_sname(int socknumber, const char *proto, int numeric)
35 sprintf(buffer, "%s", item->name);
36
37 }
38 - if (!buffer[0])
39 +
40 + if (!buffer[0]) {
41 + do_ntohs:
42 sprintf(buffer, "%d", ntohs(socknumber));
43 + }
44 return (buffer);
45 }