mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 8/8] net: remove unused getenv_ip_dns
Date: Sun, 15 Apr 2012 16:28:31 +0200	[thread overview]
Message-ID: <1334500111-26382-9-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1334500111-26382-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 include/net.h |    6 +-----
 net/net.c     |    5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/include/net.h b/include/net.h
index 01e4b22..25d7b6e 100644
--- a/include/net.h
+++ b/include/net.h
@@ -279,11 +279,7 @@ char *ip_to_string (IPaddr_t x);
 /* Convert a string to ip address */
 int string_to_ip(const char *s, IPaddr_t *ip);
 
-IPaddr_t getenv_ip_dns(const char *name, int dns);
-static inline IPaddr_t getenv_ip(const char *name)
-{
-	return getenv_ip_dns(name, 0);
-}
+IPaddr_t getenv_ip(const char *name);
 int setenv_ip(const char *name, IPaddr_t ip);
 
 int string_to_ethaddr(const char *str, char *enetaddr);
diff --git a/net/net.c b/net/net.c
index 6e2c14b..783f3d1 100644
--- a/net/net.c
+++ b/net/net.c
@@ -129,7 +129,7 @@ int string_to_ip(const char *s, IPaddr_t *ip)
 	return 0;
 }
 
-IPaddr_t getenv_ip_dns(const char *name, int dns)
+IPaddr_t getenv_ip(const char *name)
 {
 	IPaddr_t ip;
 	const char *var = getenv(name);
@@ -140,9 +140,6 @@ IPaddr_t getenv_ip_dns(const char *name, int dns)
 	if (!string_to_ip(var, &ip))
 		return ip;
 
-	if (!dns)
-		return 0;
-
 	return resolv((char*)var);
 }
 
-- 
1.7.10


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-04-15 14:28 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-15 14:28 [PATCH v2] dns work Sascha Hauer
2012-04-15 14:28 ` [PATCH 1/8] net dns: remove debug code Sascha Hauer
2012-04-15 14:28 ` [PATCH 2/8] net: use static string in string_to_ip Sascha Hauer
2012-04-15 14:28 ` [PATCH 3/8] device: make singular devices possible Sascha Hauer
2012-04-15 14:28 ` [PATCH 4/8] net: register a 'net' device to store network specific variables Sascha Hauer
2012-04-15 14:28 ` [PATCH 5/8] dhcp: set global nameserver/domainname Sascha Hauer
2012-04-15 14:28 ` [PATCH 6/8] dns: use " Sascha Hauer
2012-04-15 14:28 ` [PATCH 7/8] fs tftp: use resolv to resolv ip address Sascha Hauer
2012-04-15 14:28 ` Sascha Hauer [this message]
2012-04-15 15:24 ` [PATCH v2] dns work Jean-Christophe PLAGNIOL-VILLARD
2012-04-16  7:44 ` [PATCH] Use DEVICE_ID_DYNAMIC where applicable Sascha Hauer
2012-04-16 11:12   ` Jean-Christophe PLAGNIOL-VILLARD

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=1334500111-26382-9-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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