diff options
| author | Adriano Cordova <adrianox@gmail.com> | 2024-11-11 18:08:59 -0300 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-11-16 21:35:05 +0100 |
| commit | de28a2a5f2ad93b156b39c2aee24cb5d01c7e619 (patch) | |
| tree | 50ed2fe26b25f327ec9a03e78bdc7ab97b0fe3e9 | |
| parent | 2dd076a9c1b4137f0a48e84596fa29da2e957858 (diff) | |
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>
| -rw-r--r-- | include/net-common.h | 2 | ||||
| -rw-r--r-- | include/net-lwip.h | 9 | ||||
| -rw-r--r-- | net/wget.c | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/include/net-common.h b/include/net-common.h index 1efb0db9ff5..3cd0f343744 100644 --- 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 1c3583f82a1..4d7f9387d1d 100644 --- a/include/net-lwip.h +++ b/include/net-lwip.h @@ -17,15 +17,6 @@ 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 * * @uri: uri string of target file of wget diff --git a/net/wget.c b/net/wget.c index 21f18758664..3bc2522cde5 100644 --- 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 |