net: wget: make wget_with_dns return value compatible with its lwip version

There are two wget_with_dns functions, one in the legacy network
stack and one in lwip, but the return values are not compatible.
This commit modifies the legacy version of wget_with_dns so that
the return values are compatible: 0 on success, otherwise a negative
error. This way wget_with_dns can be called in a network stack
agnostic way.

Signed-off-by: Adriano Cordova <adrianox@gmail.com>

diff --git a/include/net-common.h b/include/net-common.h
index 1efb0db9ff5f3c7130fcacc1cd8b9371a710dd00..3cd0f34374400e3e217e930245cc41f0cc40c7b7 100644 (file)
--- a/include/net-common.h
+++ b/include/net-common.h
@@ -495,7 +495,7 @@ int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
  *
  * @dst_addr:  destination address to download the file
  * @uri:       uri string of target file of wget
- * Return:     downloaded file size, negative if failed
+ * Return:     zero on success, negative if failed
  */
 int wget_with_dns(ulong dst_addr, char *uri);
 /**

diff --git a/include/net-lwip.h b/include/net-lwip.h
index 1c3583f82a1a5fec4fc4e5238c95ac88d22d3f77..4d7f9387d1d1ad3207bc5e034a9d0a3d93037c45 100644 (file)
--- a/include/net-lwip.h
+++ b/include/net-lwip.h
@@ -16,15 +16,6 @@ void net_lwip_remove_netif(struct netif *netif);
 struct netif *net_lwip_get_netif(void);
 int net_lwip_rx(struct udevice *udev, struct netif *netif);
 
-/**
- * wget_with_dns() - runs dns host IP address resulution before wget
- *
- * @dst_addr:  destination address to download the file
- * @uri:       uri string of target file of wget
- * Return:     downloaded file size, negative if failed
- */
-
-int wget_with_dns(ulong dst_addr, char *uri);
 /**
  * wget_validate_uri() - varidate the uri
  *

diff --git a/net/wget.c b/net/wget.c
index 21f1875866420aa5235a4a4b202f5001d9e3494d..3bc2522cde5a05da8f41ad2bb62c0aa9ad501378 100644 (file)
--- a/net/wget.c
+++ b/net/wget.c
@@ -579,7 +579,7 @@ int wget_with_dns(ulong dst_addr, char *uri)
 out:
        free(str_copy);
 
-       return ret;
+       return ret < 0 ? ret : 0;
 }
 #endif