From c5ec7c478098273586b7a5716e30dc82c1e6aba5 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 3 Apr 2011 18:42:33 +0000 Subject: Pass __KERNEL__ define (or not) to all makes to handle small differences in user-/kernel-builds git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3459 42af7a65-404d-4744-a932-0658087f49c3 --- apps/namedapp/exec_namedapp.c | 4 ++-- apps/netutils/tftpc/tftpc_get.c | 2 +- apps/netutils/tftpc/tftpc_put.c | 6 +++--- apps/netutils/webclient/webclient.c | 4 ++-- apps/nshlib/nsh.h | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) (limited to 'apps') diff --git a/apps/namedapp/exec_namedapp.c b/apps/namedapp/exec_namedapp.c index efd6549f8..2fc01482f 100644 --- a/apps/namedapp/exec_namedapp.c +++ b/apps/namedapp/exec_namedapp.c @@ -88,8 +88,8 @@ int namedapp_isavail(FAR const char *appname) } } - errno = ENOENT; - return -1; + set_errno(ENOENT); + return ERROR; } int exec_namedapp(FAR const char *appname, FAR const char *argv[]) diff --git a/apps/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c index e0779d17d..f4fb74dd3 100644 --- a/apps/netutils/tftpc/tftpc_get.c +++ b/apps/netutils/tftpc/tftpc_get.c @@ -167,7 +167,7 @@ int tftpget(const char *remote, const char *local, in_addr_t addr, bool binary) if (!packet) { ndbg("packet memory allocation failure\n"); - errno = ENOMEM; + set_errno(ENOMEM); goto errout; } diff --git a/apps/netutils/tftpc/tftpc_put.c b/apps/netutils/tftpc/tftpc_put.c index 4d87ba908..c292244a6 100644 --- a/apps/netutils/tftpc/tftpc_put.c +++ b/apps/netutils/tftpc/tftpc_put.c @@ -334,7 +334,7 @@ int tftpput(const char *local, const char *remote, in_addr_t addr, bool binary) if (!packet) { ndbg("packet memory allocation failure\n"); - errno = ENOMEM; + set_errno(ENOMEM); goto errout; } @@ -388,7 +388,7 @@ int tftpput(const char *local, const char *remote, in_addr_t addr, bool binary) if (++retry > TFTP_RETRIES) { ndbg("Retry count exceeded\n"); - errno = ETIMEDOUT; + set_errno(ETIMEDOUT); goto errout_with_sd; } } @@ -455,7 +455,7 @@ int tftpput(const char *local, const char *remote, in_addr_t addr, bool binary) if (++retry > TFTP_RETRIES) { ndbg("Retry count exceeded\n"); - errno = ETIMEDOUT; + set_errno(ETIMEDOUT); goto errout_with_sd; } } diff --git a/apps/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c index 2c5108a4a..e52f592f5 100644 --- a/apps/netutils/webclient/webclient.c +++ b/apps/netutils/webclient/webclient.c @@ -431,7 +431,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen, if (ret != 0) { ndbg("Malformed HTTP URL: %s\n", url); - errno = -ret; + set_errno(-ret); return ERROR; } nvdbg("hostname='%s' filename='%s'\n", ws.hostname, ws.filename); @@ -576,7 +576,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen, return OK; errout_with_errno: - errno = -ret; + set_errno(-ret); errout: close(sockfd); return ERROR; diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index 38ba66a95..91b949cb7 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -45,6 +45,7 @@ #include #include #include +#include #ifdef CONFIG_NSH_CONSOLE # include -- cgit v1.2.3